github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 12:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix misc multithreaded issues, merge from threads branch.

Browse Source
This commit is contained in:
Wilson Snyder 2018-05-19 09:30:54 -04:00
parent b6e8133a4d
commit 5e22ca77ec
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/verilated.h
View File

@ -186,9 +186,7 @@ public:
// METHODS // METHODS
/// Check that the current thread ID is the same as the construction thread ID /// Check that the current thread ID is the same as the construction thread ID
void check() VL_MT_UNSAFE_ONE { void check() VL_MT_UNSAFE_ONE {
// Memoize results in local thread, to prevent slow get_id() call if (!VL_LIKELY(m_threadid == VL_THREAD_ID())) {
VL_THREAD_LOCAL bool t_okThread = (m_threadid == VL_THREAD_ID());
if (!VL_LIKELY(t_okThread)) {
fatal_different(); fatal_different();
} }
} }

6
test_regress/Makefile_obj
View File

@ -28,8 +28,12 @@ VPATH += ../../$(VM_USER_DIR)
# Needed by DPI tests # Needed by DPI tests
CPPFLAGS += -DVERILATOR=1 CPPFLAGS += -DVERILATOR=1
# Needed by tracing routines # Debugging
CPPFLAGS += -DVL_DEBUG=1 CPPFLAGS += -DVL_DEBUG=1
# Assertions disabled as SystemC libraries are not clean
#CPPFLAGS += -D_GLIBCXX_DEBUG
# Needed by tracing routines
CPPFLAGS += -DTEST_OBJ_DIR=$(TEST_OBJ_DIR) CPPFLAGS += -DTEST_OBJ_DIR=$(TEST_OBJ_DIR)
CPPFLAGS += -DVM_PREFIX=$(VM_PREFIX) CPPFLAGS += -DVM_PREFIX=$(VM_PREFIX)
CPPFLAGS += -DVM_PREFIX_INCLUDE="<$(VM_PREFIX).h>" CPPFLAGS += -DVM_PREFIX_INCLUDE="<$(VM_PREFIX).h>"

3
test_regress/t/t_vlcov_merge.pl
View File

@ -19,6 +19,9 @@ run(cmd => ["../bin/verilator_coverage",
# Older clib's didn't properly sort maps, but the coverage data doesn't # Older clib's didn't properly sort maps, but the coverage data doesn't
# really care about ordering. So avoid false failures by sorting. # really care about ordering. So avoid false failures by sorting.
# Set LC_ALL as suggested in the sort manpage to avoid sort order
# changes from the locale.
$ENV{LC_ALL} = "C";
run(cmd => ["sort", run(cmd => ["sort",
"$Self->{obj_dir}/coverage.dat", "$Self->{obj_dir}/coverage.dat",
"> $Self->{obj_dir}/coverage-sort.dat", "> $Self->{obj_dir}/coverage-sort.dat",

29
test_regress/t/t_vpi_get.cpp
View File

@ -156,20 +156,27 @@ struct params {
unsigned int scalar; unsigned int scalar;
int type; int type;
} attributes, children; } attributes, children;
} values[] = {
{"onebit", {1, vpiNoDirection, 1, vpiReg}, {0, 0, 0, 0}},
{"twoone", {2, vpiNoDirection, 0, vpiReg}, {0, 0, 0, 0}},
{"onetwo", {2, vpiNoDirection, 0, TestSimulator::is_verilator() ? vpiReg : vpiMemory}, {0, 0, 0, 0}},
{"fourthreetwoone", {2, vpiNoDirection, 0, vpiMemory}, {2, vpiNoDirection, 0, vpiMemoryWord}},
{"clk", {1, vpiInput, 1, vpiPort}, {0, 0, 0, 0}},
{"testin", {16, vpiInput, 0, vpiPort}, {0, 0, 0, 0}},
{"testout", {24, vpiOutput, 0, vpiPort}, {0, 0, 0, 0}},
{"sub.subin", {1, vpiInput, 1, vpiPort}, {0, 0, 0, 0}},
{"sub.subout", {1, vpiOutput, 1, vpiPort}, {0, 0, 0, 0}},
{NULL, {0, 0, 0, 0}, {0, 0, 0, 0}}
}; };
int mon_check_props() { int mon_check_props() {
// This table needs to be function-static.
// This avoids calling is_verilator() below at global-static init time.
// When global-static led to a race between the is_verilator call below, and
// the code that sets up the VerilatedAssertOneThread() check in
// verilated_vpi.cc, it was causing the check to falsely fail
// (due to m_threadid within the check not being initted yet.)
static struct params values[] = {
{"onebit", {1, vpiNoDirection, 1, vpiReg}, {0, 0, 0, 0}},
{"twoone", {2, vpiNoDirection, 0, vpiReg}, {0, 0, 0, 0}},
{"onetwo", {2, vpiNoDirection, 0, TestSimulator::is_verilator() ? vpiReg : vpiMemory}, {0, 0, 0, 0}},
{"fourthreetwoone", {2, vpiNoDirection, 0, vpiMemory}, {2, vpiNoDirection, 0, vpiMemoryWord}},
{"clk", {1, vpiInput, 1, vpiPort}, {0, 0, 0, 0}},
{"testin", {16, vpiInput, 0, vpiPort}, {0, 0, 0, 0}},
{"testout", {24, vpiOutput, 0, vpiPort}, {0, 0, 0, 0}},
{"sub.subin", {1, vpiInput, 1, vpiPort}, {0, 0, 0, 0}},
{"sub.subout", {1, vpiOutput, 1, vpiPort}, {0, 0, 0, 0}},
{NULL, {0, 0, 0, 0}, {0, 0, 0, 0}}
};
struct params* value = values; struct params* value = values;
while (value->signal) { while (value->signal) {
TestVpiHandle h = VPI_HANDLE(value->signal); TestVpiHandle h = VPI_HANDLE(value->signal);