Fix sc names (#2500)

cint.mainInt(nodep) walks the tree and populates m_ctorVarsVec.
Reuse EmitCImp cint for the slow mainImp() emition steps to make sure
we emit constructor calls to setup SystemC sc_module names.
This commit is contained in:
Edgar E. Iglesias 2020-08-13 14:23:02 +02:00 committed by GitHub
parent 20c906261b
commit 5d98035170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 74 additions and 2 deletions

View File

@ -11,6 +11,7 @@ Dan Petrisko
David Horton
David Stanford
Driss Hafdi
Edgar E. Iglesias
Eric Rippey
Fan Shupei
Garrett Smith

View File

@ -3791,8 +3791,8 @@ void V3EmitC::emitc() {
nodep = VN_CAST(nodep->nextp(), NodeModule)) {
if (VN_IS(nodep, Class)) continue; // Imped with ClassPackage
// clang-format off
{ EmitCImp cint; cint.mainInt(nodep); }
{ EmitCImp slow; slow.mainImp(nodep, true); }
EmitCImp cint; cint.mainInt(nodep);
cint.mainImp(nodep, true);
{ EmitCImp fast; fast.mainImp(nodep, false); }
// clang-format on
}

View File

@ -0,0 +1,30 @@
// -*- mode: C++; c-file-style: "cc-mode" -*-
// This file ONLY is placed under the Creative Commons Public Domain, for
// any use, without warranty, 2020 by Edgar E. Iglesias.
// SPDX-License-Identifier: CC0-1.0
#include VM_PREFIX_INCLUDE
#include "Vt_sc_names.h"
VM_PREFIX* tb = NULL;
int sc_main(int argc, char* argv[]) {
tb = new VM_PREFIX("tb");
std::vector < sc_object* > ch = tb->get_child_objects();
bool found = false;
/* We expect to find clk in here. */
for (int i = 0; i < ch.size(); ++i) {
if (!strcmp(ch[i]->basename(), "clk")) {
found = true;
}
}
if (found) {
VL_PRINTF("*-* All Finished *-*\n");
tb->final();
} else {
vl_fatal(__FILE__, __LINE__, "tb", "Unexpected results\n");
}
return 0;
}

30
test_regress/t/t_sc_names.pl Executable file
View File

@ -0,0 +1,30 @@
#!/usr/bin/env perl
if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
#
# Copyright 2020 by Edgar E. Iglesias. 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
scenarios(simulator => 1);
if (!$Self->have_sc) {
skip("No SystemC installed");
}
else {
top_filename("t/t_sc_names.v");
compile(
make_main => 0,
verilator_flags2 => ["-sc --exe $Self->{t_dir}/t_sc_names.cpp"],
);
execute(
check_finished => 1,
);
}
ok(1);
1;

View File

@ -0,0 +1,11 @@
// DESCRIPTION: Verilator: Verilog Test module
//
// This file ONLY is placed under the Creative Commons Public Domain, for
// any use, without warranty, 2020 by Edgar E. Iglesias.
// SPDX-License-Identifier: CC0-1.0
module t (
clk
);
input clk;
endmodule