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

Tests: Cleanup some unused functions.

This commit is contained in:
Wilson Snyder 2021-02-03 18:50:15 -05:00
parent 153335ff35
commit fe0a42eaa8
4 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test_regress/t/t_vpi_time_cb.cpp
View File

@ -45,18 +45,6 @@ unsigned int callback_count_start_of_sim = 0;
//====================================================================== //======================================================================
#define CHECK_RESULT_VH(got, exp) \
if ((got) != (exp)) { \
printf("%%Error: %s:%d: GOT = %p EXP = %p\n", __FILE__, __LINE__, (got), (exp)); \
return __LINE__; \
}
#define CHECK_RESULT_NZ(got) \
if (!(got)) { \
printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", __FILE__, __LINE__); \
return __LINE__; \
}
// Use cout to avoid issues with %d/%lx etc // Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \ #define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \ if ((got) != (exp)) { \
@ -65,26 +53,6 @@ unsigned int callback_count_start_of_sim = 0;
return __LINE__; \ return __LINE__; \
} }
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_CSTR(got, exp) \
if (strcmp((got), (exp))) { \
printf("%%Error: %s:%d: GOT = '%s' EXP = '%s'\n", __FILE__, __LINE__, \
(got) ? (got) : "<null>", (exp) ? (exp) : "<null>"); \
return __LINE__; \
}
#define CHECK_RESULT_CSTR_STRIP(got, exp) CHECK_RESULT_CSTR(got + strspn(got, " "), exp)
// We cannot replace those with VL_STRINGIFY, not available when PLI is build
#define STRINGIFY(x) STRINGIFY2(x)
#define STRINGIFY2(x) #x
//====================================================================== //======================================================================
#ifdef IS_VPI #ifdef IS_VPI
@ -243,12 +211,12 @@ int main(int argc, char** argv, char** env) {
VL_PRINTF("Enabling waves...\n"); VL_PRINTF("Enabling waves...\n");
VerilatedVcdC* tfp = new VerilatedVcdC; VerilatedVcdC* tfp = new VerilatedVcdC;
topp->trace(tfp, 99); topp->trace(tfp, 99);
tfp->open(STRINGIFY(TEST_OBJ_DIR) "/simx.vcd"); tfp->open(VL_STRINGIFY(TEST_OBJ_DIR) "/simx.vcd");
#endif #endif
// Load and initialize the PLI application // Load and initialize the PLI application
{ {
const char* filenamep = STRINGIFY(TEST_OBJ_DIR) "/libvpi.so"; const char* filenamep = VL_STRINGIFY(TEST_OBJ_DIR) "/libvpi.so";
void* lib = dlopen(filenamep, RTLD_LAZY); void* lib = dlopen(filenamep, RTLD_LAZY);
void* bootstrap = dlsym(lib, "vpi_compat_bootstrap"); void* bootstrap = dlsym(lib, "vpi_compat_bootstrap");
if (!bootstrap) { if (!bootstrap) {

2
test_regress/t/t_vpi_time_cb.pl
View File

@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# Version 2.0. # Version 2.0.
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
scenarios(simulator => 1, iv => 1); scenarios(simulator => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,

28
test_regress/t/t_vpi_zero_time_cb.cpp
View File

@ -44,18 +44,6 @@ unsigned int callback_count_start_of_sim = 0;
//====================================================================== //======================================================================
#define CHECK_RESULT_VH(got, exp) \
if ((got) != (exp)) { \
printf("%%Error: %s:%d: GOT = %p EXP = %p\n", __FILE__, __LINE__, (got), (exp)); \
return __LINE__; \
}
#define CHECK_RESULT_NZ(got) \
if (!(got)) { \
printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", __FILE__, __LINE__); \
return __LINE__; \
}
// Use cout to avoid issues with %d/%lx etc // Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \ #define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \ if ((got) != (exp)) { \
@ -64,22 +52,6 @@ unsigned int callback_count_start_of_sim = 0;
return __LINE__; \ return __LINE__; \
} }
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_CSTR(got, exp) \
if (strcmp((got), (exp))) { \
printf("%%Error: %s:%d: GOT = '%s' EXP = '%s'\n", __FILE__, __LINE__, \
(got) ? (got) : "<null>", (exp) ? (exp) : "<null>"); \
return __LINE__; \
}
#define CHECK_RESULT_CSTR_STRIP(got, exp) CHECK_RESULT_CSTR(got + strspn(got, " "), exp)
//====================================================================== //======================================================================
#ifdef IS_VPI #ifdef IS_VPI

2
test_regress/t/t_vpi_zero_time_cb.pl
View File

@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
# Version 2.0. # Version 2.0.
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 # SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
scenarios(simulator => 1, iv => 1); scenarios(simulator => 1);
compile( compile(
make_top_shell => 0, make_top_shell => 0,