From 069eb97eca01eba7de7391b33883052ab58bbbbc Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 29 Aug 2020 10:45:47 -0400 Subject: [PATCH] SystemC 2.3.0 or newer (SYSTEMC_VERSION >= 20111121) is now required. --- Changes | 2 + bin/verilator | 16 ++-- examples/make_hello_sc/sc_main.cpp | 8 -- examples/make_tracing_sc/sc_main.cpp | 20 ----- include/verilated.h | 7 +- include/verilated_vcd_sc.cpp | 101 ++---------------------- include/verilated_vcd_sc.h | 110 ++------------------------- src/V3Ast.h | 3 +- src/V3EmitC.cpp | 3 +- src/V3EmitXml.cpp | 1 - src/V3LinkParse.cpp | 5 -- src/V3PreShell.cpp | 2 - src/verilog.l | 3 +- src/verilog.y | 4 +- test_regress/driver.pl | 4 - test_regress/t/t_clk_first_bad.out | 2 +- test_regress/t/t_preproc_defines.out | 1 - test_regress/t/t_trace_two_sc.cpp | 8 -- 18 files changed, 25 insertions(+), 275 deletions(-) diff --git a/Changes b/Changes index 32636f486..f4453b7ce 100644 --- a/Changes +++ b/Changes @@ -7,6 +7,8 @@ The contributors that suggested a given feature are shown in []. Thanks! ** C++11 or newer compilers are now required. +** SystemC 2.3.0 or newer (SYSTEMC_VERSION >= 20111121) is now required. + ** Support hierarchical Verilation (#2206). [Yutetsu TAKATSUKASA] **** Support (with limitations) class extern, class extends, virtual class. diff --git a/bin/verilator b/bin/verilator index a01399f9a..e685664d7 100755 --- a/bin/verilator +++ b/bin/verilator @@ -3690,10 +3690,11 @@ for more information. =item /*verilator sc_clock*/ -Deprecated. Used after an input declaration to indicate the signal -should be declared in SystemC as a sc_clock instead of a bool. This was -needed in SystemC 1.1 and 1.2 only; versions 2.0 and later do not require -clock pins to be sc_clocks and this is no longer needed. +Deprecated and ignored. Previously used after an input declaration to +indicate the signal should be declared in SystemC as a sc_clock instead of +a bool. This was needed in SystemC 1.1 and 1.2 only; versions 2.0 and +later do not require clock pins to be sc_clocks and this is no longer +needed and is ignored. =item /*verilator sc_bv*/ @@ -5056,13 +5057,6 @@ Verilator currently requires C++11 or newer compilers. Verilator will require C++14 or newer compilers for both compiling Verilator and compiling Verilated models no sooner than January 2022. -=item SystemC 2.2 and earlier support - -Support for SystemC versions 2.2 and earlier including the related sc_clock -variable attribute will be removed no sooner than September 2020. The -supported versions will be SystemC 2.3.0 (SYSTEMC_VERSION 20111121) and -later (presently 2.3.0, 2.3.1, 2.3.2, 2.3.3). - =item Configuration File -msg The -msg argument to lint_off has been replaced with -rule. -msg is diff --git a/examples/make_hello_sc/sc_main.cpp b/examples/make_hello_sc/sc_main.cpp index 91f9b49ff..208ba582b 100644 --- a/examples/make_hello_sc/sc_main.cpp +++ b/examples/make_hello_sc/sc_main.cpp @@ -29,19 +29,11 @@ int sc_main(int argc, char* argv[]) { Vtop* top = new Vtop("top"); // Initialize SC model -#if (SYSTEMC_VERSION >= 20070314) sc_start(1, SC_NS); -#else - sc_start(1); -#endif // Simulate until $finish while (!Verilated::gotFinish()) { -#if (SYSTEMC_VERSION >= 20070314) sc_start(1, SC_NS); -#else - sc_start(1); -#endif } // Final model cleanup diff --git a/examples/make_tracing_sc/sc_main.cpp b/examples/make_tracing_sc/sc_main.cpp index b9a81b37b..9df44e1e1 100644 --- a/examples/make_tracing_sc/sc_main.cpp +++ b/examples/make_tracing_sc/sc_main.cpp @@ -44,21 +44,9 @@ int sc_main(int argc, char* argv[]) { // General logfile ios::sync_with_stdio(); - // Defaults time -#if (SYSTEMC_VERSION > 20011000) -#else - sc_time dut(1.0, sc_ns); - sc_set_default_time_unit(dut); -#endif - // Define clocks -#if (SYSTEMC_VERSION >= 20070314) sc_clock clk("clk", 10, SC_NS, 0.5, 3, SC_NS, true); sc_clock fastclk("fastclk", 2, SC_NS, 0.5, 2, SC_NS, true); -#else - sc_clock clk("clk", 10, 0.5, 3, true); - sc_clock fastclk("fastclk", 2, 0.5, 2, true); -#endif // Define interconnect sc_signal reset_l; @@ -89,11 +77,7 @@ int sc_main(int argc, char* argv[]) { // You must do one evaluation before enabling waves, in order to allow // SystemC to interconnect everything for testing. -#if (SYSTEMC_VERSION >= 20070314) sc_start(1, SC_NS); -#else - sc_start(1); -#endif #if VM_TRACE // If verilator was invoked with --trace argument, @@ -125,11 +109,7 @@ int sc_main(int argc, char* argv[]) { } // Simulate 1ns -#if (SYSTEMC_VERSION >= 20070314) sc_start(1, SC_NS); -#else - sc_start(1); -#endif } // Final model cleanup diff --git a/include/verilated.h b/include/verilated.h index 71b370b47..4f25248bd 100644 --- a/include/verilated.h +++ b/include/verilated.h @@ -61,7 +61,7 @@ // Version check #if defined(SYSTEMC_VERSION) && (SYSTEMC_VERSION < 20111121) -# warning "Verilator soon requires SystemC 2.3.*; see manual for deprecated other versions." +# warning "Verilator requires SystemC 2.3.* or newer." #endif // clang-format on @@ -846,13 +846,8 @@ extern int VL_TIME_STR_CONVERT(const char* strp) VL_PURE; /// Return current simulation time #if defined(SYSTEMC_VERSION) -# if SYSTEMC_VERSION > 20011000 // Already defined: extern sc_time sc_time_stamp(); inline vluint64_t vl_time_stamp64() { return sc_time_stamp().value(); } -# else // Before SystemC changed to integral time representation -// Already defined: extern double sc_time_stamp(); -inline vluint64_t vl_time_stamp64() { return static_cast(sc_time_stamp()); } -# endif #else // Non-SystemC # ifdef VL_TIME_STAMP64 extern vluint64_t vl_time_stamp64(); diff --git a/include/verilated_vcd_sc.cpp b/include/verilated_vcd_sc.cpp index db863366a..a09935527 100644 --- a/include/verilated_vcd_sc.cpp +++ b/include/verilated_vcd_sc.cpp @@ -25,22 +25,21 @@ //====================================================================== //-------------------------------------------------- -#if (SYSTEMC_VERSION >= 20050714) // SystemC 2.1.v1 // cppcheck-suppress unusedFunction void VerilatedVcdSc::write_comment(const std::string&) {} void VerilatedVcdSc::trace(const unsigned int&, const std::string&, const char**) {} -// clang-format off -# define DECL_TRACE_METHOD_A(tp) \ +#define DECL_TRACE_METHOD_A(tp) \ void VerilatedVcdSc::trace(const tp& object, const std::string& name) {} -# define DECL_TRACE_METHOD_B(tp) \ +#define DECL_TRACE_METHOD_B(tp) \ void VerilatedVcdSc::trace(const tp& object, const std::string& name, int width) {} -# if (SYSTEMC_VERSION >= 20171012) +// clang-format off +#if (SYSTEMC_VERSION >= 20171012) DECL_TRACE_METHOD_A( sc_event ) DECL_TRACE_METHOD_A( sc_time ) -# endif +#endif DECL_TRACE_METHOD_A( bool ) DECL_TRACE_METHOD_A( sc_dt::sc_bit ) @@ -50,9 +49,9 @@ void VerilatedVcdSc::trace(const unsigned int&, const std::string&, const char** DECL_TRACE_METHOD_B( unsigned short ) DECL_TRACE_METHOD_B( unsigned int ) DECL_TRACE_METHOD_B( unsigned long ) -# ifdef SYSTEMC_64BIT_PATCHES +#ifdef SYSTEMC_64BIT_PATCHES DECL_TRACE_METHOD_B( unsigned long long) -# endif +#endif DECL_TRACE_METHOD_B( char ) DECL_TRACE_METHOD_B( short ) DECL_TRACE_METHOD_B( int ) @@ -76,92 +75,6 @@ void VerilatedVcdSc::trace(const unsigned int&, const std::string&, const char** DECL_TRACE_METHOD_A( sc_dt::sc_lv_base ) // clang-format on -//-------------------------------------------------- -#elif (SYSTEMC_VERSION > 20011000) -// SystemC 2.0.1 -// cppcheck-suppress unusedFunction -void VerilatedVcdSc::write_comment(const sc_string&) {} -void VerilatedVcdSc::trace(const unsigned int&, const sc_string&, const char**) {} - -#define DECL_TRACE_METHOD_A(tp) \ - void VerilatedVcdSc::trace(const tp& object, const sc_string& name) {} -#define DECL_TRACE_METHOD_B(tp) \ - void VerilatedVcdSc::trace(const tp& object, const sc_string& name, int width) {} - -// clang-format off - DECL_TRACE_METHOD_A( bool ) - DECL_TRACE_METHOD_A( sc_bit ) - DECL_TRACE_METHOD_A( sc_logic ) - DECL_TRACE_METHOD_B( unsigned char ) - DECL_TRACE_METHOD_B( unsigned short ) - DECL_TRACE_METHOD_B( unsigned int ) - DECL_TRACE_METHOD_B( unsigned long ) -#ifdef SYSTEMC_64BIT_PATCHES - DECL_TRACE_METHOD_B( unsigned long long) -#endif -#if (SYSTEMC_VERSION > 20041000) - DECL_TRACE_METHOD_B( unsigned long long) - DECL_TRACE_METHOD_B( long long) -#endif - DECL_TRACE_METHOD_B( char ) - DECL_TRACE_METHOD_B( short ) - DECL_TRACE_METHOD_B( int ) - DECL_TRACE_METHOD_B( long ) - DECL_TRACE_METHOD_A( float ) - DECL_TRACE_METHOD_A( double ) - DECL_TRACE_METHOD_A( sc_int_base ) - DECL_TRACE_METHOD_A( sc_uint_base ) - DECL_TRACE_METHOD_A( sc_signed ) - DECL_TRACE_METHOD_A( sc_unsigned ) - DECL_TRACE_METHOD_A( sc_fxval ) - DECL_TRACE_METHOD_A( sc_fxval_fast ) - DECL_TRACE_METHOD_A( sc_fxnum ) - DECL_TRACE_METHOD_A( sc_fxnum_fast ) - DECL_TRACE_METHOD_A( sc_bv_base ) - DECL_TRACE_METHOD_A( sc_lv_base ) -// clang-format on - -//-------------------------------------------------- -#else -// SystemC 1.2.1beta -// cppcheck-suppress unusedFunction -void VerilatedVcdSc::write_comment(const sc_string&) {} -void VerilatedVcdSc::trace(const unsigned int&, const sc_string&, const char**) {} - -#define DECL_TRACE_METHOD_A(tp) \ - void VerilatedVcdSc::trace(const tp& object, const sc_string& name) {} -#define DECL_TRACE_METHOD_B(tp) \ - void VerilatedVcdSc::trace(const tp& object, const sc_string& name, int width) {} - -// clang-format off - DECL_TRACE_METHOD_A( bool ) - DECL_TRACE_METHOD_B( unsigned char ) - DECL_TRACE_METHOD_B( short unsigned int ) - DECL_TRACE_METHOD_B( unsigned int ) - DECL_TRACE_METHOD_B( long unsigned int ) - DECL_TRACE_METHOD_B( char ) - DECL_TRACE_METHOD_B( short int ) - DECL_TRACE_METHOD_B( int ) - DECL_TRACE_METHOD_B( long int ) - DECL_TRACE_METHOD_A( float ) - DECL_TRACE_METHOD_A( double ) - DECL_TRACE_METHOD_A( sc_bit ) - DECL_TRACE_METHOD_A( sc_logic ) - DECL_TRACE_METHOD_A( sc_bool_vector ) - DECL_TRACE_METHOD_A( sc_logic_vector ) - DECL_TRACE_METHOD_A( sc_signal_bool_vector ) - DECL_TRACE_METHOD_A( sc_signal_logic_vector ) - DECL_TRACE_METHOD_A( sc_uint_base ) - DECL_TRACE_METHOD_A( sc_int_base ) - DECL_TRACE_METHOD_A( sc_unsigned ) - DECL_TRACE_METHOD_A( sc_signed ) - DECL_TRACE_METHOD_A( sc_signal_resolved ) - DECL_TRACE_METHOD_A( sc_signal_resolved_vector ) - DECL_TRACE_METHOD_A( sc_bv_ns::sc_bv_base ) - DECL_TRACE_METHOD_A( sc_bv_ns::sc_lv_base ) -// clang-format on -#endif - #undef DECL_TRACE_METHOD_A #undef DECL_TRACE_METHOD_B diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h index dcadc8bc2..9e69ebe1e 100644 --- a/include/verilated_vcd_sc.h +++ b/include/verilated_vcd_sc.h @@ -38,7 +38,6 @@ class VerilatedVcdSc : sc_trace_file, public VerilatedVcdC { public: VerilatedVcdSc() { sc_get_curr_simcontext()->add_trace_file(this); -#if (SYSTEMC_VERSION >= 20060505) // We want to avoid a depreciated warning, but still be back compatible. // Turning off the message just for this still results in an // annoying "to turn off" message. @@ -48,25 +47,13 @@ public: spTrace()->set_time_unit(tunits.to_string()); } spTrace()->set_time_resolution(sc_get_time_resolution().to_string()); -#elif (SYSTEMC_VERSION > 20011000) - // To confuse matters 2.1.beta returns a char* here, while 2.1.v1 returns a std::string - // we allow both flavors with overloaded set_time_* functions. - spTrace()->set_time_unit(sc_get_default_time_unit().to_string()); - spTrace()->set_time_resolution(sc_get_time_resolution().to_string()); -#endif } virtual ~VerilatedVcdSc() { close(); } // METHODS /// Called by SystemC simulate() virtual void cycle(bool delta_cycle) { -#if (SYSTEMC_VERSION > 20011000) if (!delta_cycle) { this->dump(sc_time_stamp().to_double()); } -#else - // VCD files must have integer timestamps, so we write all times in - // increments of time_resolution - if (!delta_cycle) { this->dump(sc_time_stamp().to_double()); } -#endif } private: @@ -76,14 +63,10 @@ private: // Cadence Incisive has these as abstract functions so we must create them virtual void set_time_unit(int exponent10_seconds) {} // deprecated #endif -#if defined(NC_SYSTEMC) || (SYSTEMC_VERSION >= 20111100) virtual void set_time_unit(double v, sc_time_unit tu) {} // LCOV_EXCL_LINE -#endif //-------------------------------------------------- -#if (SYSTEMC_VERSION >= 20050714) // SystemC 2.1.v1 - // clang-format off # define DECL_TRACE_METHOD_A(tp) virtual void trace(const tp& object, const std::string& name); # define DECL_TRACE_METHOD_B(tp) \ virtual void trace(const tp& object, const std::string& name, int width); @@ -91,11 +74,12 @@ private: virtual void write_comment(const std::string&); virtual void trace(const unsigned int&, const std::string&, const char**); + // clang-format off // Formatting matches that of sc_trace.h -# if (SYSTEMC_VERSION >= 20171012) +#if (SYSTEMC_VERSION >= 20171012) DECL_TRACE_METHOD_A( sc_event ) DECL_TRACE_METHOD_A( sc_time ) -# endif +#endif DECL_TRACE_METHOD_A( bool ) DECL_TRACE_METHOD_A( sc_dt::sc_bit ) @@ -105,9 +89,9 @@ private: DECL_TRACE_METHOD_B( unsigned short ) DECL_TRACE_METHOD_B( unsigned int ) DECL_TRACE_METHOD_B( unsigned long ) -# ifdef SYSTEMC_64BIT_PATCHES +#ifdef SYSTEMC_64BIT_PATCHES DECL_TRACE_METHOD_B( unsigned long long) -# endif +#endif DECL_TRACE_METHOD_B( char ) DECL_TRACE_METHOD_B( short ) DECL_TRACE_METHOD_B( int ) @@ -131,90 +115,6 @@ private: DECL_TRACE_METHOD_A( sc_dt::sc_lv_base ) // clang-format on -//-------------------------------------------------- -#elif (SYSTEMC_VERSION > 20011000) - // SystemC 2.0.1 - // clang-format off -# define DECL_TRACE_METHOD_A(tp) virtual void trace(const tp& object, const sc_string& name); -# define DECL_TRACE_METHOD_B(tp) \ - virtual void trace(const tp& object, const sc_string& name, int width); - - virtual void write_comment(const sc_string&); - virtual void trace(const unsigned int&, const sc_string&, const char**); - virtual void delta_cycles(bool) {} - virtual void space(int n) {} - - DECL_TRACE_METHOD_A( bool ) - DECL_TRACE_METHOD_A( sc_bit ) - DECL_TRACE_METHOD_A( sc_logic ) - DECL_TRACE_METHOD_B( unsigned char ) - DECL_TRACE_METHOD_B( unsigned short ) - DECL_TRACE_METHOD_B( unsigned int ) - DECL_TRACE_METHOD_B( unsigned long ) -# ifdef SYSTEMC_64BIT_PATCHES - DECL_TRACE_METHOD_B( unsigned long long) -# endif -# if (SYSTEMC_VERSION > 20041000) - DECL_TRACE_METHOD_B( unsigned long long) - DECL_TRACE_METHOD_B( long long) -# endif - DECL_TRACE_METHOD_B( char ) - DECL_TRACE_METHOD_B( short ) - DECL_TRACE_METHOD_B( int ) - DECL_TRACE_METHOD_B( long ) - DECL_TRACE_METHOD_A( float ) - DECL_TRACE_METHOD_A( double ) - DECL_TRACE_METHOD_A( sc_int_base ) - DECL_TRACE_METHOD_A( sc_uint_base ) - DECL_TRACE_METHOD_A( sc_signed ) - DECL_TRACE_METHOD_A( sc_unsigned ) - DECL_TRACE_METHOD_A( sc_fxval ) - DECL_TRACE_METHOD_A( sc_fxval_fast ) - DECL_TRACE_METHOD_A( sc_fxnum ) - DECL_TRACE_METHOD_A( sc_fxnum_fast ) - DECL_TRACE_METHOD_A( sc_bv_base ) - DECL_TRACE_METHOD_A( sc_lv_base ) - // clang-format on - -//-------------------------------------------------- -#else - // SystemC 1.2.1beta - // clang-format off -# define DECL_TRACE_METHOD_A(tp) virtual void trace(const tp& object, const sc_string& name); -# define DECL_TRACE_METHOD_B(tp) \ - virtual void trace(const tp& object, const sc_string& name, int width); - - virtual void write_comment(const sc_string&); - virtual void trace(const unsigned int&, const sc_string&, const char**); - - DECL_TRACE_METHOD_A( bool ) - DECL_TRACE_METHOD_B( unsigned char ) - DECL_TRACE_METHOD_B( short unsigned int ) - DECL_TRACE_METHOD_B( unsigned int ) - DECL_TRACE_METHOD_B( long unsigned int ) - DECL_TRACE_METHOD_B( char ) - DECL_TRACE_METHOD_B( short int ) - DECL_TRACE_METHOD_B( int ) - DECL_TRACE_METHOD_B( long int ) - DECL_TRACE_METHOD_A( float ) - DECL_TRACE_METHOD_A( double ) - DECL_TRACE_METHOD_A( sc_bit ) - DECL_TRACE_METHOD_A( sc_logic ) - DECL_TRACE_METHOD_A( sc_bool_vector ) - DECL_TRACE_METHOD_A( sc_logic_vector ) - DECL_TRACE_METHOD_A( sc_signal_bool_vector ) - DECL_TRACE_METHOD_A( sc_signal_logic_vector ) - DECL_TRACE_METHOD_A( sc_uint_base ) - DECL_TRACE_METHOD_A( sc_int_base ) - DECL_TRACE_METHOD_A( sc_unsigned ) - DECL_TRACE_METHOD_A( sc_signed ) - DECL_TRACE_METHOD_A( sc_signal_resolved ) - DECL_TRACE_METHOD_A( sc_signal_resolved_vector ) - DECL_TRACE_METHOD_A( sc_bv_ns::sc_bv_base ) - DECL_TRACE_METHOD_A( sc_bv_ns::sc_lv_base ) -# endif - // clang-format on - #undef DECL_TRACE_METHOD_A #undef DECL_TRACE_METHOD_B }; diff --git a/src/V3Ast.h b/src/V3Ast.h index b20e11f14..636f45df1 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -343,7 +343,6 @@ public: TYPENAME, // V3Width processes // VAR_BASE, // V3LinkResolve creates for AstPreSel, V3LinkParam removes - VAR_CLOCK, // V3LinkParse moves to AstVar::attrScClocked VAR_CLOCK_ENABLE, // V3LinkParse moves to AstVar::attrClockEn VAR_PUBLIC, // V3LinkParse moves to AstVar::sigPublic VAR_PUBLIC_FLAT, // V3LinkParse moves to AstVar::sigPublic @@ -369,7 +368,7 @@ public: "ENUM_NEXT", "ENUM_PREV", "ENUM_NAME", "MEMBER_BASE", "TYPENAME", - "VAR_BASE", "VAR_CLOCK", "VAR_CLOCK_ENABLE", "VAR_PUBLIC", + "VAR_BASE", "VAR_CLOCK_ENABLE", "VAR_PUBLIC", "VAR_PUBLIC_FLAT", "VAR_PUBLIC_FLAT_RD", "VAR_PUBLIC_FLAT_RW", "VAR_ISOLATE_ASSIGNMENTS", "VAR_SC_BV", "VAR_SFORMAT", "VAR_CLOCKER", "VAR_NO_CLOCKER", "VAR_SPLIT_VAR" diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index c1799b6fb..467d8af97 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -1858,7 +1858,6 @@ void EmitCStmts::emitVarCtors(bool* firstp) { if (!m_ctorVarsVec.empty()) { ofp()->indentInc(); puts("\n"); - puts("#if (SYSTEMC_VERSION>20011000)\n"); // SystemC 2.0.1 and newer for (const AstVar* varp : m_ctorVarsVec) { bool isArray = !VN_CAST(varp->dtypeSkipRefp(), BasicDType); if (isArray) { @@ -1873,7 +1872,7 @@ void EmitCStmts::emitVarCtors(bool* firstp) { puts(")"); } } - puts("\n#endif\n"); + puts("\n"); ofp()->indentDec(); } } diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp index b913eb755..da2d26720 100644 --- a/src/V3EmitXml.cpp +++ b/src/V3EmitXml.cpp @@ -160,7 +160,6 @@ class EmitXmlFileVisitor : public AstNVisitor { puts(" localparam=\"true\""); } if (nodep->attrScBv()) puts(" sc_bv=\"true\""); - if (nodep->attrScClocked()) puts(" sc_clock=\"true\""); if (nodep->attrSFormat()) puts(" sformat=\"true\""); outputChildrenEnd(nodep, ""); } diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp index 8ef50018a..9da01d844 100644 --- a/src/V3LinkParse.cpp +++ b/src/V3LinkParse.cpp @@ -266,11 +266,6 @@ private: UASSERT_OBJ(typep, nodep, "Attribute not attached to typedef"); typep->attrPublic(true); VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); - } else if (nodep->attrType() == AstAttrType::VAR_CLOCK) { - UASSERT_OBJ(m_varp, nodep, "Attribute not attached to variable"); - nodep->v3warn(DEPRECATED, "sc_clock is deprecated and will be removed"); - m_varp->attrScClocked(true); - VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); } else if (nodep->attrType() == AstAttrType::VAR_CLOCK_ENABLE) { UASSERT_OBJ(m_varp, nodep, "Attribute not attached to variable"); m_varp->attrClockEn(true); diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp index b79a95348..54de5495d 100644 --- a/src/V3PreShell.cpp +++ b/src/V3PreShell.cpp @@ -61,8 +61,6 @@ protected: s_preprocp->defineCmdLine(prefl, "VERILATOR", "1"); // LEAK_OK s_preprocp->defineCmdLine(prefl, "verilator", "1"); // LEAK_OK s_preprocp->defineCmdLine(prefl, "verilator3", "1"); // LEAK_OK - s_preprocp->defineCmdLine(prefl, "systemc_clock", - "/*verilator systemc_clock*/"); // LEAK_OK s_preprocp->defineCmdLine(prefl, "coverage_block_off", "/*verilator coverage_block_off*/"); // LEAK_OK if (prefl->language().systemVerilog()) { diff --git a/src/verilog.l b/src/verilog.l index 4394b2650..a357f122c 100644 --- a/src/verilog.l +++ b/src/verilog.l @@ -716,10 +716,9 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5} "/*verilator public_flat_rw*/" { FL; return yVL_PUBLIC_FLAT_RW; } // The @(edge) is converted by the preproc "/*verilator public_module*/" { FL; return yVL_PUBLIC_MODULE; } "/*verilator sc_bv*/" { FL; return yVL_SC_BV; } - "/*verilator sc_clock*/" { FL; return yVL_CLOCK; } + "/*verilator sc_clock*/" { FL; yylval.fl->v3warn(DEPRECATED, "sc_clock is ignored"); FL_BRK; } "/*verilator sformat*/" { FL; return yVL_SFORMAT; } "/*verilator split_var*/" { FL; return yVL_SPLIT_VAR; } - "/*verilator systemc_clock*/" { FL; return yVL_CLOCK; } "/*verilator tag"[^*]*"*/" { FL; yylval.strp = PARSEP->newString(V3ParseImp::lexParseTag(yytext)); return yVL_TAG; } "/*verilator tracing_off*/" { FL_FWD; PARSEP->lexFileline()->tracingOn(false); FL_BRK; } diff --git a/src/verilog.y b/src/verilog.y index 55cbb221a..1e7fe37aa 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -800,7 +800,6 @@ BISONPRE_VERSION(3.7,%define api.header.include {"V3ParseBison.h"}) %token yD_WRITEMEMH "$writememh" %token yD_WRITEO "$writeo" -%token yVL_CLOCK "/*verilator sc_clock*/" %token yVL_CLOCKER "/*verilator clocker*/" %token yVL_CLOCK_ENABLE "/*verilator clock_enable*/" %token yVL_COVERAGE_BLOCK_OFF "/*verilator coverage_block_off*/" @@ -2563,8 +2562,7 @@ sigAttrList: ; sigAttr: - yVL_CLOCK { $$ = new AstAttrOf($1,AstAttrType::VAR_CLOCK); } - | yVL_CLOCKER { $$ = new AstAttrOf($1,AstAttrType::VAR_CLOCKER); } + yVL_CLOCKER { $$ = new AstAttrOf($1,AstAttrType::VAR_CLOCKER); } | yVL_NO_CLOCKER { $$ = new AstAttrOf($1,AstAttrType::VAR_NO_CLOCKER); } | yVL_CLOCK_ENABLE { $$ = new AstAttrOf($1,AstAttrType::VAR_CLOCK_ENABLE); } | yVL_PUBLIC { $$ = new AstAttrOf($1,AstAttrType::VAR_PUBLIC); v3Global.dpi(true); } diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 4e668eee6..eadd21b69 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -1848,11 +1848,7 @@ sub _print_advance_time { else { $set = "topp->"; } if ($self->sc) { - print $fh "#if (SYSTEMC_VERSION>=20070314)\n"; print $fh " sc_start(${time}, $Self->{sc_time_resolution});\n"; - print $fh "#else\n"; - print $fh " sc_start(${time});\n"; - print $fh "#endif\n"; } else { if ($action) { print $fh " ${set}eval();\n"; diff --git a/test_regress/t/t_clk_first_bad.out b/test_regress/t/t_clk_first_bad.out index a640ff6c4..d12bc84d9 100644 --- a/test_regress/t/t_clk_first_bad.out +++ b/test_regress/t/t_clk_first_bad.out @@ -1,4 +1,4 @@ -%Warning-DEPRECATED: t/t_clk_first_deprecated.v:12:14: sc_clock is deprecated and will be removed +%Warning-DEPRECATED: t/t_clk_first_deprecated.v:12:14: sc_clock is ignored 12 | input clk /*verilator sc_clock*/ ; | ^~~~~~~~~~~~~~~~~~~~~~ ... Use "/* verilator lint_off DEPRECATED */" and lint_on around source to disable this message. diff --git a/test_regress/t/t_preproc_defines.out b/test_regress/t/t_preproc_defines.out index a1eaedd69..e410899bc 100644 --- a/test_regress/t/t_preproc_defines.out +++ b/test_regress/t/t_preproc_defines.out @@ -20,6 +20,5 @@ `define VERILATOR 1 `define WITH_ARG(a) (a)(a) `define coverage_block_off /*verilator coverage_block_off*/ -`define systemc_clock /*verilator systemc_clock*/ `define verilator 1 `define verilator3 1 diff --git a/test_regress/t/t_trace_two_sc.cpp b/test_regress/t/t_trace_two_sc.cpp index 21a7a954b..66e145145 100644 --- a/test_regress/t/t_trace_two_sc.cpp +++ b/test_regress/t/t_trace_two_sc.cpp @@ -48,19 +48,11 @@ int sc_main(int argc, char** argv) { #endif { clk = false; -#if (SYSTEMC_VERSION>=20070314) sc_start(10, SC_NS); -#else - sc_start(10); -#endif } while (sc_time_stamp() < sim_time && !Verilated::gotFinish()) { clk = !clk; -#if (SYSTEMC_VERSION>=20070314) sc_start(5, SC_NS); -#else - sc_start(5); -#endif } if (!Verilated::gotFinish()) { vl_fatal(__FILE__, __LINE__, "main", "%Error: Timeout; never got a $finish");