diff --git a/ivtest/vpi/nextsimtime_common.c b/ivtest/vpi/nextsimtime_cb.c similarity index 100% rename from ivtest/vpi/nextsimtime_common.c rename to ivtest/vpi/nextsimtime_cb.c diff --git a/ivtest/vpi/nextsimtime_common.v b/ivtest/vpi/nextsimtime_cb.v similarity index 100% rename from ivtest/vpi/nextsimtime_common.v rename to ivtest/vpi/nextsimtime_cb.v diff --git a/ivtest/vpi/nextsimtime_cb1.c b/ivtest/vpi/nextsimtime_cb1.c new file mode 100644 index 000000000..b90273b4b --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb1.c @@ -0,0 +1,2 @@ +#define TEST_SIM_TIME +#include "nextsimtime_cb.c" diff --git a/ivtest/vpi/nextsimtime_cb1.v b/ivtest/vpi/nextsimtime_cb1.v new file mode 100644 index 000000000..d7c7cff1d --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb1.v @@ -0,0 +1 @@ +`include "vpi/nextsimtime_cb.v" diff --git a/ivtest/vpi/nextsimtime_cb2.c b/ivtest/vpi/nextsimtime_cb2.c new file mode 100644 index 000000000..35d6dd690 --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb2.c @@ -0,0 +1,2 @@ +#define TEST_SCALED_TIME +#include "nextsimtime_cb.c" diff --git a/ivtest/vpi/nextsimtime_cb2.v b/ivtest/vpi/nextsimtime_cb2.v new file mode 100644 index 000000000..d7c7cff1d --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb2.v @@ -0,0 +1 @@ +`include "vpi/nextsimtime_cb.v" diff --git a/ivtest/vpi/nextsimtime_cb3.c b/ivtest/vpi/nextsimtime_cb3.c new file mode 100644 index 000000000..acf54664e --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb3.c @@ -0,0 +1,2 @@ +#define TEST_SUPPRESS_TIME +#include "nextsimtime_cb.c" diff --git a/ivtest/vpi/nextsimtime_cb3.v b/ivtest/vpi/nextsimtime_cb3.v new file mode 100644 index 000000000..d7c7cff1d --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb3.v @@ -0,0 +1 @@ +`include "vpi/nextsimtime_cb.v" diff --git a/ivtest/vpi/nextsimtime_cb4.c b/ivtest/vpi/nextsimtime_cb4.c new file mode 100644 index 000000000..8dae6b8f3 --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb4.c @@ -0,0 +1,2 @@ +#define TEST_NULL_TIME +#include "nextsimtime_cb.c" diff --git a/ivtest/vpi/nextsimtime_cb4.v b/ivtest/vpi/nextsimtime_cb4.v new file mode 100644 index 000000000..d7c7cff1d --- /dev/null +++ b/ivtest/vpi/nextsimtime_cb4.v @@ -0,0 +1 @@ +`include "vpi/nextsimtime_cb.v" diff --git a/ivtest/vpi/nextsimtime_null_time.c b/ivtest/vpi/nextsimtime_null_time.c deleted file mode 100644 index 3a61905f6..000000000 --- a/ivtest/vpi/nextsimtime_null_time.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_NULL_TIME -#include "nextsimtime_common.c" diff --git a/ivtest/vpi/nextsimtime_null_time.v b/ivtest/vpi/nextsimtime_null_time.v deleted file mode 100644 index 4d31b0d01..000000000 --- a/ivtest/vpi/nextsimtime_null_time.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/nextsimtime_common.v" diff --git a/ivtest/vpi/nextsimtime_scaled_time.c b/ivtest/vpi/nextsimtime_scaled_time.c deleted file mode 100644 index a33a17d6e..000000000 --- a/ivtest/vpi/nextsimtime_scaled_time.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_SCALED_TIME -#include "nextsimtime_common.c" diff --git a/ivtest/vpi/nextsimtime_scaled_time.v b/ivtest/vpi/nextsimtime_scaled_time.v deleted file mode 100644 index 4d31b0d01..000000000 --- a/ivtest/vpi/nextsimtime_scaled_time.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/nextsimtime_common.v" diff --git a/ivtest/vpi/nextsimtime_sim_time.c b/ivtest/vpi/nextsimtime_sim_time.c deleted file mode 100644 index 3c4b79e39..000000000 --- a/ivtest/vpi/nextsimtime_sim_time.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_SIM_TIME -#include "nextsimtime_common.c" diff --git a/ivtest/vpi/nextsimtime_sim_time.v b/ivtest/vpi/nextsimtime_sim_time.v deleted file mode 100644 index 4d31b0d01..000000000 --- a/ivtest/vpi/nextsimtime_sim_time.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/nextsimtime_common.v" diff --git a/ivtest/vpi/nextsimtime_suppress_time.c b/ivtest/vpi/nextsimtime_suppress_time.c deleted file mode 100644 index 14ba3e786..000000000 --- a/ivtest/vpi/nextsimtime_suppress_time.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_SUPPRESS_TIME -#include "nextsimtime_common.c" diff --git a/ivtest/vpi/nextsimtime_suppress_time.v b/ivtest/vpi/nextsimtime_suppress_time.v deleted file mode 100644 index 4d31b0d01..000000000 --- a/ivtest/vpi/nextsimtime_suppress_time.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/nextsimtime_common.v" diff --git a/ivtest/vpi/value_change1.c b/ivtest/vpi/value_change1.c deleted file mode 100644 index 33830de7b..000000000 --- a/ivtest/vpi/value_change1.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_SIM_TIME -#include "value_change.c" diff --git a/ivtest/vpi/value_change1.v b/ivtest/vpi/value_change1.v deleted file mode 100644 index d1b7ef31b..000000000 --- a/ivtest/vpi/value_change1.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/value_change.v" diff --git a/ivtest/vpi/value_change2.c b/ivtest/vpi/value_change2.c deleted file mode 100644 index ede0c8033..000000000 --- a/ivtest/vpi/value_change2.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_SCALED_TIME -#include "value_change.c" diff --git a/ivtest/vpi/value_change2.v b/ivtest/vpi/value_change2.v deleted file mode 100644 index d1b7ef31b..000000000 --- a/ivtest/vpi/value_change2.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/value_change.v" diff --git a/ivtest/vpi/value_change3.c b/ivtest/vpi/value_change3.c deleted file mode 100644 index 58462ceb7..000000000 --- a/ivtest/vpi/value_change3.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_SUPPRESS_TIME -#include "value_change.c" diff --git a/ivtest/vpi/value_change3.v b/ivtest/vpi/value_change3.v deleted file mode 100644 index d1b7ef31b..000000000 --- a/ivtest/vpi/value_change3.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/value_change.v" diff --git a/ivtest/vpi/value_change4.c b/ivtest/vpi/value_change4.c deleted file mode 100644 index c39b94168..000000000 --- a/ivtest/vpi/value_change4.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_NULL_TIME -#include "value_change.c" diff --git a/ivtest/vpi/value_change4.v b/ivtest/vpi/value_change4.v deleted file mode 100644 index d1b7ef31b..000000000 --- a/ivtest/vpi/value_change4.v +++ /dev/null @@ -1 +0,0 @@ -`include "vpi/value_change.v" diff --git a/ivtest/vpi/value_change.c b/ivtest/vpi/value_change_cb.c similarity index 97% rename from ivtest/vpi/value_change.c rename to ivtest/vpi/value_change_cb.c index cf3c09f7c..2f6a2d26b 100644 --- a/ivtest/vpi/value_change.c +++ b/ivtest/vpi/value_change_cb.c @@ -6,9 +6,9 @@ #define TIME_TYPE vpiSuppressTime #endif -# include -# include -# include +#include +#include +#include static PLI_INT32 report_change(p_cb_data cb) { diff --git a/ivtest/vpi/value_change.v b/ivtest/vpi/value_change_cb.v similarity index 100% rename from ivtest/vpi/value_change.v rename to ivtest/vpi/value_change_cb.v diff --git a/ivtest/vpi/value_change_cb1.c b/ivtest/vpi/value_change_cb1.c new file mode 100644 index 000000000..f1cf3b310 --- /dev/null +++ b/ivtest/vpi/value_change_cb1.c @@ -0,0 +1,2 @@ +#define TEST_SIM_TIME +#include "value_change_cb.c" diff --git a/ivtest/vpi/value_change_cb1.v b/ivtest/vpi/value_change_cb1.v new file mode 100644 index 000000000..98ad87dd4 --- /dev/null +++ b/ivtest/vpi/value_change_cb1.v @@ -0,0 +1 @@ +`include "vpi/value_change_cb.v" diff --git a/ivtest/vpi/value_change_cb2.c b/ivtest/vpi/value_change_cb2.c new file mode 100644 index 000000000..50d5529b9 --- /dev/null +++ b/ivtest/vpi/value_change_cb2.c @@ -0,0 +1,2 @@ +#define TEST_SCALED_TIME +#include "value_change_cb.c" diff --git a/ivtest/vpi/value_change_cb2.v b/ivtest/vpi/value_change_cb2.v new file mode 100644 index 000000000..98ad87dd4 --- /dev/null +++ b/ivtest/vpi/value_change_cb2.v @@ -0,0 +1 @@ +`include "vpi/value_change_cb.v" diff --git a/ivtest/vpi/value_change_cb3.c b/ivtest/vpi/value_change_cb3.c new file mode 100644 index 000000000..25047b1c4 --- /dev/null +++ b/ivtest/vpi/value_change_cb3.c @@ -0,0 +1,2 @@ +#define TEST_SUPPRESS_TIME +#include "value_change_cb.c" diff --git a/ivtest/vpi/value_change_cb3.v b/ivtest/vpi/value_change_cb3.v new file mode 100644 index 000000000..98ad87dd4 --- /dev/null +++ b/ivtest/vpi/value_change_cb3.v @@ -0,0 +1 @@ +`include "vpi/value_change_cb.v" diff --git a/ivtest/vpi/value_change_cb4.c b/ivtest/vpi/value_change_cb4.c new file mode 100644 index 000000000..005e36c68 --- /dev/null +++ b/ivtest/vpi/value_change_cb4.c @@ -0,0 +1,2 @@ +#define TEST_NULL_TIME +#include "value_change_cb.c" diff --git a/ivtest/vpi/value_change_cb4.v b/ivtest/vpi/value_change_cb4.v new file mode 100644 index 000000000..98ad87dd4 --- /dev/null +++ b/ivtest/vpi/value_change_cb4.v @@ -0,0 +1 @@ +`include "vpi/value_change_cb.v" diff --git a/ivtest/vpi_gold/nextsimtime_cb1.gold b/ivtest/vpi_gold/nextsimtime_cb1.gold new file mode 100644 index 000000000..c32082f43 --- /dev/null +++ b/ivtest/vpi_gold/nextsimtime_cb1.gold @@ -0,0 +1,8 @@ +Compiling vpi/nextsimtime_cb1.c... +Making nextsimtime_cb1.vpi from nextsimtime_cb1.o... +time 0: 0 +nextsimtime: 1000 +time 1: 1 +nextsimtime: 4000 +time 4: 4 +nextsimtime: 5000 diff --git a/ivtest/vpi_gold/nextsimtime_cb2.gold b/ivtest/vpi_gold/nextsimtime_cb2.gold new file mode 100644 index 000000000..5c68a4772 --- /dev/null +++ b/ivtest/vpi_gold/nextsimtime_cb2.gold @@ -0,0 +1,8 @@ +Compiling vpi/nextsimtime_cb2.c... +Making nextsimtime_cb2.vpi from nextsimtime_cb2.o... +time 0: 0 +nextsimtime: 1.000000 +time 1: 1 +nextsimtime: 4.000000 +time 4: 4 +nextsimtime: 5.000000 diff --git a/ivtest/vpi_gold/nextsimtime_cb3.gold b/ivtest/vpi_gold/nextsimtime_cb3.gold new file mode 100644 index 000000000..56d0f862e --- /dev/null +++ b/ivtest/vpi_gold/nextsimtime_cb3.gold @@ -0,0 +1,8 @@ +Compiling vpi/nextsimtime_cb3.c... +Making nextsimtime_cb3.vpi from nextsimtime_cb3.o... +time 0: 0 +nextsimtime: 1000 +time 1: 1 +nextsimtime: 4000 +time 4: 4 +nextsimtime: 5000 diff --git a/ivtest/vpi_gold/nextsimtime_cb4.gold b/ivtest/vpi_gold/nextsimtime_cb4.gold new file mode 100644 index 000000000..66c2b9cfd --- /dev/null +++ b/ivtest/vpi_gold/nextsimtime_cb4.gold @@ -0,0 +1,8 @@ +Compiling vpi/nextsimtime_cb4.c... +Making nextsimtime_cb4.vpi from nextsimtime_cb4.o... +time 0: 0 +nextsimtime: 1000 +time 1: 1 +nextsimtime: 4000 +time 4: 4 +nextsimtime: 5000 diff --git a/ivtest/vpi_gold/nextsimtime_null_time.gold b/ivtest/vpi_gold/nextsimtime_null_time.gold deleted file mode 100644 index 1a513b1c7..000000000 --- a/ivtest/vpi_gold/nextsimtime_null_time.gold +++ /dev/null @@ -1,8 +0,0 @@ -Compiling vpi/nextsimtime_null_time.c... -Making nextsimtime_null_time.vpi from nextsimtime_null_time.o... -time 0: 0 -nextsimtime: 1000 -time 1: 1 -nextsimtime: 4000 -time 4: 4 -nextsimtime: 5000 diff --git a/ivtest/vpi_gold/nextsimtime_scaled_time.gold b/ivtest/vpi_gold/nextsimtime_scaled_time.gold deleted file mode 100644 index c3df10b6f..000000000 --- a/ivtest/vpi_gold/nextsimtime_scaled_time.gold +++ /dev/null @@ -1,8 +0,0 @@ -Compiling vpi/nextsimtime_scaled_time.c... -Making nextsimtime_scaled_time.vpi from nextsimtime_scaled_time.o... -time 0: 0 -nextsimtime: 1.000000 -time 1: 1 -nextsimtime: 4.000000 -time 4: 4 -nextsimtime: 5.000000 diff --git a/ivtest/vpi_gold/nextsimtime_sim_time.gold b/ivtest/vpi_gold/nextsimtime_sim_time.gold deleted file mode 100644 index 3ad99a8af..000000000 --- a/ivtest/vpi_gold/nextsimtime_sim_time.gold +++ /dev/null @@ -1,8 +0,0 @@ -Compiling vpi/nextsimtime_sim_time.c... -Making nextsimtime_sim_time.vpi from nextsimtime_sim_time.o... -time 0: 0 -nextsimtime: 1000 -time 1: 1 -nextsimtime: 4000 -time 4: 4 -nextsimtime: 5000 diff --git a/ivtest/vpi_gold/nextsimtime_suppress_time.gold b/ivtest/vpi_gold/nextsimtime_suppress_time.gold deleted file mode 100644 index 35edff5f3..000000000 --- a/ivtest/vpi_gold/nextsimtime_suppress_time.gold +++ /dev/null @@ -1,8 +0,0 @@ -Compiling vpi/nextsimtime_suppress_time.c... -Making nextsimtime_suppress_time.vpi from nextsimtime_suppress_time.o... -time 0: 0 -nextsimtime: 1000 -time 1: 1 -nextsimtime: 4000 -time 4: 4 -nextsimtime: 5000 diff --git a/ivtest/vpi_gold/value_change1.gold b/ivtest/vpi_gold/value_change_cb1.gold similarity index 76% rename from ivtest/vpi_gold/value_change1.gold rename to ivtest/vpi_gold/value_change_cb1.gold index 5832d4203..6b9ff85b5 100644 --- a/ivtest/vpi_gold/value_change1.gold +++ b/ivtest/vpi_gold/value_change_cb1.gold @@ -1,5 +1,5 @@ -Compiling vpi/value_change1.c... -Making value_change1.vpi from value_change1.o... +Compiling vpi/value_change_cb1.c... +Making value_change_cb1.vpi from value_change_cb1.o... At time 1000 v4 = 1 At time 1000 w4 = 1 At time 2000 i4 = 2 diff --git a/ivtest/vpi_gold/value_change2.gold b/ivtest/vpi_gold/value_change_cb2.gold similarity index 79% rename from ivtest/vpi_gold/value_change2.gold rename to ivtest/vpi_gold/value_change_cb2.gold index 6e4c177b9..50d47629e 100644 --- a/ivtest/vpi_gold/value_change2.gold +++ b/ivtest/vpi_gold/value_change_cb2.gold @@ -1,5 +1,5 @@ -Compiling vpi/value_change2.c... -Making value_change2.vpi from value_change2.o... +Compiling vpi/value_change_cb2.c... +Making value_change_cb2.vpi from value_change_cb2.o... At time 1.000000 v4 = 1 At time 1.000000 w4 = 1 At time 2.000000 i4 = 2 diff --git a/ivtest/vpi_gold/value_change3.gold b/ivtest/vpi_gold/value_change_cb3.gold similarity index 76% rename from ivtest/vpi_gold/value_change3.gold rename to ivtest/vpi_gold/value_change_cb3.gold index 2e1b32fb0..df70b959e 100644 --- a/ivtest/vpi_gold/value_change3.gold +++ b/ivtest/vpi_gold/value_change_cb3.gold @@ -1,5 +1,5 @@ -Compiling vpi/value_change3.c... -Making value_change3.vpi from value_change3.o... +Compiling vpi/value_change_cb3.c... +Making value_change_cb3.vpi from value_change_cb3.o... At time 1000 v4 = 1 At time 1000 w4 = 1 At time 2000 i4 = 2 diff --git a/ivtest/vpi_gold/value_change4.gold b/ivtest/vpi_gold/value_change_cb4.gold similarity index 76% rename from ivtest/vpi_gold/value_change4.gold rename to ivtest/vpi_gold/value_change_cb4.gold index aa9fb3008..7ba3ee92b 100644 --- a/ivtest/vpi_gold/value_change4.gold +++ b/ivtest/vpi_gold/value_change_cb4.gold @@ -1,5 +1,5 @@ -Compiling vpi/value_change4.c... -Making value_change4.vpi from value_change4.o... +Compiling vpi/value_change_cb4.c... +Making value_change_cb4.vpi from value_change_cb4.o... At time 1000 v4 = 1 At time 1000 w4 = 1 At time 2000 i4 = 2 diff --git a/ivtest/vpi_regress.list b/ivtest/vpi_regress.list index 24c928180..982f61381 100644 --- a/ivtest/vpi_regress.list +++ b/ivtest/vpi_regress.list @@ -99,10 +99,10 @@ hello_tf normal hello_tf.c hello_tf.log hello_vpi normal hello_vpi.c hello.log hello_vpi2 normal hello_vpi2.c hello2.log vpi/hello_vpi1.c listparams normal listparams.c listparams.log -nextsimtime_null_time normal nextsimtime_null_time.c nextsimtime_null_time.gold -nextsimtime_scaled_time normal nextsimtime_scaled_time.c nextsimtime_scaled_time.gold -nextsimtime_sim_time normal nextsimtime_sim_time.c nextsimtime_sim_time.gold -nextsimtime_suppress_time normal nextsimtime_suppress_time.c nextsimtime_suppress_time.gold +nextsimtime_cb1 normal nextsimtime_cb1.c nextsimtime_cb1.gold +nextsimtime_cb2 normal nextsimtime_cb2.c nextsimtime_cb2.gold +nextsimtime_cb3 normal nextsimtime_cb3.c nextsimtime_cb3.gold +nextsimtime_cb4 normal nextsimtime_cb4.c nextsimtime_cb4.gold memmon normal,-g1995 memmon.c memmon.log memwide normal memwide.cc memwide.log mipname normal mipname.c mipname.log @@ -137,10 +137,10 @@ sim_time_cb2 normal sim_time_cb2.c sim_time_cb2.gold spec_delays normal,-gspecify spec_delays.c spec_delays.log start_of_simtime1 normal start_of_simtime1.c start_of_simtime1.log timescale normal timescale.c timescale.log -value_change1 normal,-g2009 value_change1.c value_change1.gold -value_change2 normal,-g2009 value_change2.c value_change2.gold -value_change3 normal,-g2009 value_change3.c value_change3.gold -value_change4 normal,-g2009 value_change4.c value_change4.gold +value_change_cb1 normal,-g2009 value_change_cb1.c value_change_cb1.gold +value_change_cb2 normal,-g2009 value_change_cb2.c value_change_cb2.gold +value_change_cb3 normal,-g2009 value_change_cb3.c value_change_cb3.gold +value_change_cb4 normal,-g2009 value_change_cb4.c value_change_cb4.gold # Add new tests in alphabetic/numeric order. If the test needs # a compile option or a different log file to run with an older