luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc internal coverage cleanups

This commit is contained in:
Wilson Snyder 2020-12-07 23:15:29 -05:00
parent a15540dfdd
commit 8e06b1e925
12 changed files with 85 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3Broken.cpp
View File

@ -329,3 +329,13 @@ void V3Broken::brokenAll(AstNetlist* nodep) {
void V3Broken::addNewed(AstNode* nodep) { BrokenTable::addNewed(nodep); }
void V3Broken::deleted(AstNode* nodep) { BrokenTable::deleted(nodep); }
bool V3Broken::isAllocated(AstNode* nodep) { return BrokenTable::isAllocated(nodep); }
void V3Broken::selfTest() {
// Warmup addNewed and deleted for coverage, as otherwise only with VL_LEAK_CHECKS
FileLine* fl = new FileLine(FileLine::commandLineFilename());
auto* newp = new AstBegin(fl, "[EditWrapper]", nullptr);
#ifndef VL_LEAK_CHECKS
addNewed(newp);
deleted(newp);
#endif
VL_DO_DANGLING(delete newp, newp);
}

1
src/V3Broken.h
View File

@ -31,6 +31,7 @@ public:
static void addNewed(AstNode* nodep);
static void deleted(AstNode* nodep);
static bool isAllocated(AstNode* nodep);
static void selfTest();
};
#endif // Guard

5
src/V3EmitV.cpp
View File

@ -608,6 +608,11 @@ class EmitVBaseVisitor VL_NOT_FINAL : public EmitCBaseVisitor {
puts(")");
}
virtual void visit(AstArg* nodep) override { iterateAndNextNull(nodep->exprp()); }
virtual void visit(AstPrintTimeScale* nodep) override {
puts(nodep->verilogKwd());
puts(";\n");
}
// Terminals
virtual void visit(AstVarRef* nodep) override {
if (nodep->varScopep()) {

7
src/V3LinkParse.cpp
View File

@ -151,10 +151,11 @@ private:
cleanFileline(nodep);
iterateChildren(nodep);
if (nodep->rangep()) {
if (!VN_IS(nodep->rangep()->leftp(), Const) //
|| !VN_IS(nodep->rangep()->rightp(), Const)) {
if (VL_UNCOVERABLE(!VN_IS(nodep->rangep()->leftp(), Const) // LCOV_EXCL_START
|| !VN_IS(nodep->rangep()->rightp(), Const))) {
// We check this rule in the parser, so shouldn't fire
nodep->v3error("Enum ranges must be integral, per spec");
}
} // LCOV_EXCL_STOP
int left = nodep->rangep()->leftConst();
int right = nodep->rangep()->rightConst();
int increment = (left > right) ? -1 : 1;

28
src/V3Number.cpp
View File

@ -1687,34 +1687,6 @@ V3Number& V3Number::opLte(const V3Number& lhs, const V3Number& rhs) { return opG
V3Number& V3Number::opLtS(const V3Number& lhs, const V3Number& rhs) { return opGtS(rhs, lhs); }
V3Number& V3Number::opLteS(const V3Number& lhs, const V3Number& rhs) { return opGteS(rhs, lhs); }
V3Number& V3Number::opRotR(const V3Number& lhs, const V3Number& rhs) {
// L(lhs) bit return
NUM_ASSERT_OP_ARGS2(lhs, rhs);
NUM_ASSERT_LOGIC_ARGS2(lhs, rhs);
if (rhs.isFourState()) return setAllBitsX();
setZero();
uint32_t rhsval = rhs.toUInt();
for (int bit = 0; bit < this->width(); bit++) {
setBit(bit, lhs.bitIs((bit + rhsval) % this->width()));
}
return *this;
}
V3Number& V3Number::opRotL(const V3Number& lhs, const V3Number& rhs) {
// L(lhs) bit return
NUM_ASSERT_OP_ARGS2(lhs, rhs);
NUM_ASSERT_LOGIC_ARGS2(lhs, rhs);
if (rhs.isFourState()) return setAllBitsX();
setZero();
uint32_t rhsval = rhs.toUInt();
for (int bit = 0; bit < this->width(); bit++) {
if (bit >= static_cast<int>(rhsval)) {
setBit(bit, lhs.bitIs((bit - rhsval) % this->width()));
}
}
return *this;
}
V3Number& V3Number::opShiftR(const V3Number& lhs, const V3Number& rhs) {
// L(lhs) bit return
NUM_ASSERT_OP_ARGS2(lhs, rhs);

2
src/V3Number.h
View File

@ -377,8 +377,6 @@ public:
V3Number& opXor(const V3Number& lhs, const V3Number& rhs);
V3Number& opXnor(const V3Number& lhs, const V3Number& rhs);
V3Number& opOr(const V3Number& lhs, const V3Number& rhs);
V3Number& opRotR(const V3Number& lhs, const V3Number& rhs);
V3Number& opRotL(const V3Number& lhs, const V3Number& rhs);
V3Number& opShiftR(const V3Number& lhs, const V3Number& rhs);
V3Number& opShiftRS(const V3Number& lhs, const V3Number& rhs, // Arithmetic w/carry
uint32_t lbits);

13
src/V3Width.cpp
View File

@ -5549,7 +5549,8 @@ private:
case AstType::atMulS: newp = new AstMul(fl, lhsp, rhsp); break;
case AstType::atShiftR: newp = new AstShiftRS(fl, lhsp, rhsp); break;
case AstType::atShiftRS: newp = new AstShiftR(fl, lhsp, rhsp); break;
default: nodep->v3fatalSrc("Node needs sign change, but bad case: " << nodep); break;
default: // LCOV_EXCL_LINE
nodep->v3fatalSrc("Node needs sign change, but bad case: " << nodep); break;
}
UINFO(6, " ReplaceWithUOrSVersion: " << nodep << " w/ " << newp << endl);
nodep->replaceWith(newp);
@ -5586,7 +5587,7 @@ private:
case AstType::atDivS: newp = new AstDivD(fl, lhsp, rhsp); break;
case AstType::atMul:
case AstType::atMulS: newp = new AstMulD(fl, lhsp, rhsp); break;
default:
default: // LCOV_EXCL_LINE
nodep->v3fatalSrc("Node needs conversion to double, but bad case: " << nodep);
break;
}
@ -5618,7 +5619,7 @@ private:
case AstType::atLtS: newp = new AstLtN(fl, lhsp, rhsp); break;
case AstType::atLte:
case AstType::atLteS: newp = new AstLteN(fl, lhsp, rhsp); break;
default:
default: // LCOV_EXCL_LINE
nodep->v3fatalSrc("Node needs conversion to string, but bad case: " << nodep);
break;
}
@ -5637,7 +5638,7 @@ private:
AstNodeUniop* newp = nullptr;
switch (nodep->type()) {
case AstType::atNegate: newp = new AstNegateD(fl, lhsp); break;
default:
default: // LCOV_EXCL_LINE
nodep->v3fatalSrc("Node needs conversion to double, but bad case: " << nodep);
break;
}
@ -5732,7 +5733,7 @@ private:
if (adtypep->isRanged()) declRange = adtypep->declRange();
break;
}
break;
break; // LCOV_EXCL_LINE
}
AstConst* valp = nullptr; // If nullptr, construct from val
int val = 0;
@ -5762,7 +5763,7 @@ private:
} else {
val = bits;
}
break;
break; // LCOV_EXCL_LINE
}
case AstAttrType::DIM_HIGH: val = !declRange.ranged() ? 0 : declRange.hi(); break;
case AstAttrType::DIM_LEFT: val = !declRange.ranged() ? 0 : declRange.left(); break;

2
src/Verilator.cpp
View File

@ -23,6 +23,7 @@
#include "V3AssertPre.h"
#include "V3Begin.h"
#include "V3Branch.h"
#include "V3Broken.h"
#include "V3CCtors.h"
#include "V3CUse.h"
#include "V3Case.h"
@ -574,6 +575,7 @@ static void verilate(const string& argString) {
V3TSP::selfTest();
V3ScoreboardBase::selfTest();
V3Partition::selfTest();
V3Broken::selfTest();
}
// Read first filename

25
test_regress/t/t_debug_emitv.out
View File

@ -78,8 +78,8 @@ module Vt_debug_emitv;
end
t.sum = __Vfunc_t.sub.f__3__Vfuncout;
$display("[%0t] sum = %~", $timet.sum, t.sum);
$display("a?= $d%d", ($c(32'sh1) ? $c(32'sh14)
: $c(32'sh1e)));
$display("a?= %d", ($c(32'sh1) ? $c(32'sh14)
: $c(32'sh1e)));
$c(;);
$display("%d", $c(0));
$fopen(72'h2f6465762f6e756c6c);
@ -172,6 +172,7 @@ module Vt_debug_emitv;
$time, $time);
$sscanf(40'h666f6f3d35, "foo=%d", t.i);
;
$printtimescale;
if ((32'sh5 != t.i)) begin
$stop;
end
@ -207,3 +208,23 @@ module Vt_debug_emitv;
int signed int [31:0] __Vdly__t._Vpast_0_0;
int signed int [31:0] __Vdly__t._Vpast_1_0;
endmodule
package Vt_debug_emitv___024unit;
endpackage
package Vt_debug_emitv_Pkg;
endpackage
class Vt_debug_emitv___024unit__03a__03aCls;
int signed int [31:0] member;
???? // CFUNC '__VnoInFunc_method'
$_CSTMT(Vt_debug_emitv* const __restrict vlTOPp VL_ATTR_UNUSED = vlSymsp->TOPp;
);
???? // CFUNC 'new'
$_CSTMT(_ctor_var_reset(vlSymsp);
);
$_CSTMT(Vt_debug_emitv* const __restrict vlTOPp VL_ATTR_UNUSED = vlSymsp->TOPp;
);
$unit::Cls.member = 32'sh1;
endclass
/*class*/package Vt_debug_emitv___024unit__03a__03aCls__Vclpkg;
end/*class*/package

29
test_regress/t/t_debug_emitv.v
View File

@ -5,6 +5,25 @@
// without warranty, 2020 by Wilson Snyder.
// SPDX-License-Identifier: CC0-1.0
package Pkg;
localparam PKG_PARAM = 1;
endpackage
package PkgImp;
import Pkg::*;
export Pkg::*;
endpackage
class Cls;
int member = 1;
function void method;
endfunction
endclass
interface Iface;
logic ifsig;
modport mp(input ifsig);
endinterface
module t (/*AUTOARG*/
// Inputs
clk, in
@ -43,6 +62,10 @@ module t (/*AUTOARG*/
int fd;
int i;
int q[$];
int assoc[string];
int dyn[];
task t;
$display("stmt");
endtask
@ -91,7 +114,7 @@ module t (/*AUTOARG*/
sub.inc(fo, sum);
sum = sub.f(sum);
$display("[%0t] sum = %d", $time, sum);
$display("a?= $d", $c(1) ? $c32(20) : $c32(30));
$display("a?= %d", $c(1) ? $c32(20) : $c32(30));
$c(";");
$display("%d", $c("0"));
@ -143,12 +166,16 @@ module t (/*AUTOARG*/
$display("str = %s", str);
$display("%% [%t] [%t] to=%o td=%d", $time, $realtime, $time, $time);
$sscanf("foo=5", "foo=%d", i);
$printtimescale;
if (i != 5) $stop;
sum = $random;
sum = $random(10);
sum = $urandom;
sum = $urandom(10);
if (Pkg::PKG_PARAM != 1) $stop;
sub.r = 62.0;
end
endmodule

2
test_regress/t/t_debug_graph_test.pl
View File

@ -13,7 +13,7 @@ $ENV{VERILATOR_TEST_NO_GDB} and skip("Skipping due to VERILATOR_TEST_NO_GDB");
lint(
# Check we can call dump() on graph, and other things
v_flags => ["--lint-only --debug --debugi-V3GraphTest 9 --debugi-V3GraphDfa 9"],
v_flags => ["--lint-only --debug --debugi-V3GraphTest 9 --debugi-V3GraphDfa 9 --debug-self-test"],
);
ok(1);

5
test_regress/t/t_sys_sformat.v
View File

@ -65,9 +65,12 @@ module t;
`ifdef TEST_VERBOSE $display("chku %s", str3); `endif
if (str3 !== "u=dcba") $stop;
str3 = $sformatf("v=%v", {"a","b","c","d"}); // Value selected so is printable
str3 = $sformatf("v=%v", 4'b01xz); // Value selected so is printable
`ifdef TEST_VERBOSE $display("chkv %s", str3); `endif
str3 = $sformatf("z=%z", {"a","b","c","d"}); // Value selected so is printable
`ifdef TEST_VERBOSE $display("chkz %s", str3); `endif
$sformat(ochar,"%s","c");
if (ochar != "c") $stop;