comps

test_regress/t/TestCheck.h

@@ -0,0 +1,38 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//*************************************************************************
+//
+// Copyright 2013-2017 by Wilson Snyder. This program is free software; you can
+// redistribute it and/or modify it under the terms of either the GNU
+// Lesser General Public License Version 3 or the Perl Artistic License
+// Version 2.0.
+// SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+//
+//*************************************************************************
+
+#ifndef TEST_CHECK_H_
+#define TEST_CHECK_H_
+
+extern bool errors;
+
+#ifdef TEST_VERBOSE
+static bool verbose = true;
+#else
+static bool verbose = false;
+#endif
+
+//======================================================================
+
+// Use cout to avoid issues with %d/%lx etc
+#define TEST_CHECK(got, exp) \
+    if ((got) != (exp)) { \
+        std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << ": GOT = " << (got) \
+                  << "   EXP = " << (exp) << std::endl; \
+        errors = true; \
+    }
+
+#define TEST_VERBOSE_PRINTF(format, ...) \
+    do { \
+        if (verbose) printf(format, ##__VA_ARGS__); \
+    } while (0)
+
+#endif  // Guard

test_regress/t/t_vpi_time_cb.cpp

@@ -9,187 +9,26 @@
 //
 //*************************************************************************
 
-#ifdef IS_VPI
-
-#include "vpi_user.h"
-
-#else
-
 #include "Vt_vpi_time_cb.h"
 #include "verilated.h"
 #include "svdpi.h"
-#include <dlfcn.h>
 
 #include "Vt_vpi_time_cb__Dpi.h"
 
 #include "verilated_vpi.h"
 #include "verilated_vcd_c.h"
 
-#endif
+#include "TestCheck.h"
 
-#include <cstdlib>
+#include <dlfcn.h>
-#include <cstdio>
-#include <cstring>
 #include <iostream>
 
-#include "TestSimulator.h"
+bool errors = false;
-#include "TestVpi.h"
 
 unsigned int main_time = 0;
-unsigned int callback_count_time1 = 3;
-unsigned int callback_count_time2 = 4;
-unsigned int callback_count_start_of_sim = 0;
 
 //======================================================================
 
-// Use cout to avoid issues with %d/%lx etc
-#define CHECK_RESULT(got, exp) \
-    if ((got) != (exp)) { \
-        std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << ": GOT = " << (got) \
-                  << "   EXP = " << (exp) << std::endl; \
-        return __LINE__; \
-    }
-
-//======================================================================
-
-#ifdef IS_VPI
-
-static int _never_cb(p_cb_data cb_data) {
-    CHECK_RESULT(0, 1);  // Should never get called
-}
-
-static int _time_cb1(p_cb_data cb_data) {
-    s_vpi_time t;
-    t.type = vpiSimTime;
-    vpi_get_time(0, &t);
-    //  fprintf(stdout, "time_cb1: %d\n", t.low);
-    CHECK_RESULT(callback_count_time1, t.low);
-    callback_count_time1++;
-
-    t_cb_data cb_data_n;
-    bzero(&cb_data_n, sizeof(cb_data_n));
-    {
-        cb_data_n.reason = cbAfterDelay;
-        t.type = vpiSimTime;
-        t.high = 0;
-        t.low = 1;
-        cb_data_n.time = &t;
-        cb_data_n.cb_rtn = _time_cb1;
-        TestVpiHandle cb_data_n1_h = vpi_register_cb(&cb_data_n);
-        CHECK_RESULT(vpi_get(vpiType, cb_data_n1_h), vpiCallback);
-    }
-    {
-        // Test cancelling a callback
-        cb_data_n.reason = cbAfterDelay;
-        t.type = vpiSimTime;
-        t.high = 0;
-        t.low = 1;
-        cb_data_n.time = &t;
-        cb_data_n.cb_rtn = _never_cb;
-        TestVpiHandle cb_h = vpi_register_cb(&cb_data_n);
-        vpi_remove_cb(cb_h);
-        cb_h.freed();
-    }
-    return 0;
-}
-
-static int _time_cb2(p_cb_data cb_data) {
-    s_vpi_time t;
-    t.type = vpiSimTime;
-    vpi_get_time(0, &t);
-    //  fprintf(stdout, "time_cb2: %d\n", t.low);
-    CHECK_RESULT(callback_count_time2, t.low);
-    callback_count_time2++;
-
-    t_cb_data cb_data_n;
-    bzero(&cb_data_n, sizeof(cb_data_n));
-
-    cb_data_n.reason = cbAfterDelay;
-    t.type = vpiSimTime;
-    t.high = 0;
-    t.low = 1;
-    cb_data_n.time = &t;
-    cb_data_n.cb_rtn = _time_cb2;
-    TestVpiHandle cb_data_n2_h = vpi_register_cb(&cb_data_n);
-    CHECK_RESULT(vpi_get(vpiType, cb_data_n2_h), vpiCallback);
-    return 0;
-}
-
-static int _start_of_sim_cb(p_cb_data cb_data) {
-#ifdef TEST_VERBOSE
-    printf("-_start_of_sim_cb\n");
-#endif
-
-    t_cb_data cb_data_n1, cb_data_n2;
-    bzero(&cb_data_n1, sizeof(cb_data_n1));
-    bzero(&cb_data_n2, sizeof(cb_data_n2));
-    s_vpi_time t1, t2;
-
-    cb_data_n1.reason = cbAfterDelay;
-    t1.type = vpiSimTime;
-    t1.high = 0;
-    t1.low = 3;
-    cb_data_n1.time = &t1;
-    cb_data_n1.cb_rtn = _time_cb1;
-    TestVpiHandle cb_data_n1_h = vpi_register_cb(&cb_data_n1);
-    CHECK_RESULT(vpi_get(vpiType, cb_data_n1_h), vpiCallback);
-
-    cb_data_n2.reason = cbAfterDelay;
-    t2.type = vpiSimTime;
-    t2.high = 0;
-    t2.low = 4;
-    cb_data_n2.time = &t2;
-    cb_data_n2.cb_rtn = _time_cb2;
-    TestVpiHandle cb_data_n2_h = vpi_register_cb(&cb_data_n2);
-    callback_count_start_of_sim++;
-    return 0;
-}
-
-static int _end_of_sim_cb(p_cb_data cb_data) {
-    CHECK_RESULT(callback_count_start_of_sim, 1);
-    fprintf(stdout, "*-* All Finished *-*\n");
-    return 0;
-}
-
-// cver entry
-#ifdef __cplusplus
-extern "C"
-#endif
-
-    // clang-format off
-void vpi_compat_bootstrap(void) {
-    // clang-format on
-    t_cb_data cb_data;
-    bzero(&cb_data, sizeof(cb_data));
-    {
-        // VL_PRINTF("register start-of-sim callback\n");
-        cb_data.reason = cbStartOfSimulation;
-        cb_data.time = 0;
-        cb_data.cb_rtn = _start_of_sim_cb;
-        TestVpiHandle _start_of_sim_cb_h = vpi_register_cb(&cb_data);
-    }
-    {
-        cb_data.reason = cbEndOfSimulation;
-        cb_data.time = 0;
-        cb_data.cb_rtn = _end_of_sim_cb;
-        TestVpiHandle _end_of_sim_cb_h = vpi_register_cb(&cb_data);
-    }
-    {
-        // Test cancelling a callback
-        cb_data.reason = cbStartOfSimulation;
-        cb_data.time = 0;
-        cb_data.cb_rtn = _never_cb;
-        TestVpiHandle cb_h = vpi_register_cb(&cb_data);
-        vpi_remove_cb(cb_h);
-        cb_h.freed();
-    }
-}
-
-// icarus entry
-void (*vlog_startup_routines[])() = {vpi_compat_bootstrap, 0};
-
-#else
-
 double sc_time_stamp() { return main_time; }
 
 int main(int argc, char** argv, char** env) {
@@ -200,10 +39,8 @@ int main(int argc, char** argv, char** env) {
     VM_PREFIX* topp = new VM_PREFIX("");  // Note null name - we're flattening it out
 
 // clang-format off
-#ifdef VERILATOR
+#ifdef TEST_VERBOSE
-# ifdef TEST_VERBOSE
     Verilated::scopesDump();
-# endif
 #endif
     // clang-format on
 
@@ -238,7 +75,7 @@ int main(int argc, char** argv, char** env) {
         topp->eval();
         VerilatedVpi::callValueCbs();
         VerilatedVpi::callTimedCbs();
-        CHECK_RESULT(VerilatedVpi::cbNextDeadline(), main_time + 1);
+        TEST_CHECK(VerilatedVpi::cbNextDeadline(), main_time + 1);
         topp->clk = !topp->clk;
         // mon_do();
 #if VM_TRACE
@@ -258,7 +95,5 @@ int main(int argc, char** argv, char** env) {
 #endif
 
     VL_DO_DANGLING(delete topp, topp);
-    return 0;
+    return errors ? 10 : 0;
 }
-
-#endif

test_regress/t/t_vpi_time_cb.pl

@@ -10,20 +10,20 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
+$Self->{pli_filename} = "t_vpi_time_cb_c.cpp";
+
 compile(
     make_top_shell => 0,
     make_main => 0,
     make_pli => 1,
     sim_time => 2100,
-    iv_flags2 => ["-g2005-sv -D USE_VPI_NOT_DPI -DWAVES -DIVERILOG"],
+    iv_flags2 => ["-g2005-sv -DWAVES -DIVERILOG"],
-    v_flags2 => ["+define+USE_VPI_NOT_DPI"],
     verilator_flags2 => ["-CFLAGS '-DVL_DEBUG -ggdb' --exe --vpi --no-l2name $Self->{t_dir}/t_vpi_time_cb.cpp -LDFLAGS '-ldl -rdynamic'"],
     );
 
 execute(
     use_libvpi => 1,
     check_finished => 1,
-    all_run_flags => ['+PLUS +INT=1234 +STRSTR']
     );
 
 ok(1);

test_regress/t/t_vpi_time_cb_c.cpp

@@ -0,0 +1,158 @@
+// -*- mode: C++; c-file-style: "cc-mode" -*-
+//*************************************************************************
+//
+// Copyright 2010-2011 by Wilson Snyder. This program is free software; you can
+// redistribute it and/or modify it under the terms of either the GNU
+// Lesser General Public License Version 3 or the Perl Artistic License
+// Version 2.0.
+// SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+//
+//*************************************************************************
+
+#include "vpi_user.h"
+
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <iostream>
+
+#include "TestCheck.h"
+#include "TestSimulator.h"
+#include "TestVpi.h"
+
+bool errors = false;
+
+unsigned int callback_count_time1 = 3;
+unsigned int callback_count_time2 = 4;
+unsigned int callback_count_start_of_sim = 0;
+
+//======================================================================
+
+static int _never_cb(p_cb_data cb_data) {
+    TEST_CHECK(0, 1);  // Should never get called
+    return 0;
+}
+
+static int _time_cb1(p_cb_data cb_data) {
+    s_vpi_time t;
+    t.type = vpiSimTime;
+    vpi_get_time(0, &t);
+    TEST_VERBOSE_PRINTF("time_cb1: %d\n", t.low);
+    TEST_CHECK(callback_count_time1, t.low);
+    callback_count_time1++;
+
+    t_cb_data cb_data_n;
+    bzero(&cb_data_n, sizeof(cb_data_n));
+    {
+        cb_data_n.reason = cbAfterDelay;
+        t.type = vpiSimTime;
+        t.high = 0;
+        t.low = 1;
+        cb_data_n.time = &t;
+        cb_data_n.cb_rtn = _time_cb1;
+        TestVpiHandle cb_data_n1_h = vpi_register_cb(&cb_data_n);
+        TEST_CHECK(vpi_get(vpiType, cb_data_n1_h), vpiCallback);
+    }
+    {
+        // Test cancelling a callback
+        cb_data_n.reason = cbAfterDelay;
+        t.type = vpiSimTime;
+        t.high = 0;
+        t.low = 1;
+        cb_data_n.time = &t;
+        cb_data_n.cb_rtn = _never_cb;
+        TestVpiHandle cb_h = vpi_register_cb(&cb_data_n);
+        vpi_remove_cb(cb_h);
+        cb_h.freed();
+    }
+    return 0;
+}
+
+static int _time_cb2(p_cb_data cb_data) {
+    s_vpi_time t;
+    t.type = vpiSimTime;
+    vpi_get_time(0, &t);
+    TEST_VERBOSE_PRINTF("time_cb2: %d\n", t.low);
+    TEST_CHECK(callback_count_time2, t.low);
+    callback_count_time2++;
+
+    t_cb_data cb_data_n;
+    bzero(&cb_data_n, sizeof(cb_data_n));
+
+    cb_data_n.reason = cbAfterDelay;
+    t.type = vpiSimTime;
+    t.high = 0;
+    t.low = 1;
+    cb_data_n.time = &t;
+    cb_data_n.cb_rtn = _time_cb2;
+    TestVpiHandle cb_data_n2_h = vpi_register_cb(&cb_data_n);
+    TEST_CHECK(vpi_get(vpiType, cb_data_n2_h), vpiCallback);
+    return 0;
+}
+
+static int _start_of_sim_cb(p_cb_data cb_data) {
+    TEST_VERBOSE_PRINTF("-_start_of_sim_cb\n");
+
+    t_cb_data cb_data_n1, cb_data_n2;
+    bzero(&cb_data_n1, sizeof(cb_data_n1));
+    bzero(&cb_data_n2, sizeof(cb_data_n2));
+    s_vpi_time t1, t2;
+
+    cb_data_n1.reason = cbAfterDelay;
+    t1.type = vpiSimTime;
+    t1.high = 0;
+    t1.low = 3;
+    cb_data_n1.time = &t1;
+    cb_data_n1.cb_rtn = _time_cb1;
+    TestVpiHandle cb_data_n1_h = vpi_register_cb(&cb_data_n1);
+    TEST_CHECK(vpi_get(vpiType, cb_data_n1_h), vpiCallback);
+
+    cb_data_n2.reason = cbAfterDelay;
+    t2.type = vpiSimTime;
+    t2.high = 0;
+    t2.low = 4;
+    cb_data_n2.time = &t2;
+    cb_data_n2.cb_rtn = _time_cb2;
+    TestVpiHandle cb_data_n2_h = vpi_register_cb(&cb_data_n2);
+    callback_count_start_of_sim++;
+    return 0;
+}
+
+static int _end_of_sim_cb(p_cb_data cb_data) {
+    TEST_CHECK(callback_count_start_of_sim, 1);
+    if (!errors) fprintf(stdout, "*-* All Finished *-*\n");
+    return 0;
+}
+
+extern "C" void vpi_compat_bootstrap(void) {
+    t_cb_data cb_data;
+    bzero(&cb_data, sizeof(cb_data));
+    {
+        TEST_VERBOSE_PRINTF("register _start_of_sim_cb_h\n");
+        cb_data.reason = cbStartOfSimulation;
+        cb_data.time = 0;
+        cb_data.cb_rtn = _start_of_sim_cb;
+        TestVpiHandle _start_of_sim_cb_h = vpi_register_cb(&cb_data);
+    }
+    {
+        TEST_VERBOSE_PRINTF("register _end_of_sim_cb_h\n");
+        cb_data.reason = cbEndOfSimulation;
+        cb_data.time = 0;
+        cb_data.cb_rtn = _end_of_sim_cb;
+        TestVpiHandle _end_of_sim_cb_h = vpi_register_cb(&cb_data);
+    }
+    {
+        // Test cancelling a callback
+        cb_data.reason = cbStartOfSimulation;
+        cb_data.time = 0;
+        cb_data.cb_rtn = _never_cb;
+        TestVpiHandle cb_h = vpi_register_cb(&cb_data);
+        vpi_remove_cb(cb_h);
+        cb_h.freed();
+    }
+}
+
+#ifdef IVERILOG
+// icarus entry
+void (*vlog_startup_routines[])() = {vpi_compat_bootstrap, 0};
+#endif