Skip to content

Commit

Permalink
Merge branch 'dev/panda' into feature/nx_power_estimation
Browse files Browse the repository at this point in the history
  • Loading branch information
Ansaya committed Feb 27, 2023
2 parents 6b727ce + 5e21fca commit 3b637ed
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
10 changes: 5 additions & 5 deletions etc/lib/technology/NC_STD_IPs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ VHDL_PROVIDED=
<description>This component is part of the BAMBU/PANDA IP LIBRARY</description>
<copyright>Copyright (C) 2016-2023 Politecnico di Milano</copyright>
<authors>Marco Lattuada &lt;[email protected]&gt;</authors>
<license>PANDA_GPLv3</license>
<license>PANDA_LGPLv3</license>
<structural_type_descriptor id_type="ui_concat_3_3_FU"/>
<port_o id="in1" dir="IN">
<structural_type_descriptor type="UINT" size="1"/>
Expand Down Expand Up @@ -1543,7 +1543,7 @@ assign out1 = {tmp_in2, tmp_in1};" VHDL_PROVIDED="begin
<description>This component is part of the BAMBU/PANDA IP LIBRARY</description>
<copyright>Copyright (C) 2016-2023 Politecnico di Milano</copyright>
<authors>Marco Lattuada &lt;[email protected]&gt;</authors>
<license>PANDA_GPLv3</license>
<license>PANDA_LGPLv3</license>
<structural_type_descriptor id_type="concat_24_3_FU"/>
<port_o id="in1" dir="IN">
<structural_type_descriptor type="INT" size="1"/>
Expand Down Expand Up @@ -1582,7 +1582,7 @@ assign out1 = {tmp_in3, tmp_in2, tmp_in1};
<description>This component is part of the BAMBU/PANDA IP LIBRARY</description>
<copyright>Copyright (C) 2016-2023 Politecnico di Milano</copyright>
<authors>Marco Lattuada &lt;[email protected]&gt;</authors>
<license>PANDA_GPLv3</license>
<license>PANDA_LGPLv3</license>
<structural_type_descriptor id_type="ui_concat_24_3_FU"/>
<port_o id="in1" dir="IN">
<structural_type_descriptor type="UINT" size="1"/>
Expand Down Expand Up @@ -1831,7 +1831,7 @@ assign out1 = {tmp_in8, tmp_in7, tmp_in6, tmp_in5, tmp_in4, tmp_in3, tmp_in2, tm
<description>This component is part of the BAMBU/PANDA IP LIBRARY</description>
<copyright>Copyright (C) 2004-2023 Politecnico di Milano</copyright>
<authors>Marco Lattuada &lt;[email protected]&gt;</authors>
<license>PANDA_GPLv3</license>
<license>PANDA_LGPLv3</license>
<structural_type_descriptor id_type="concat_64_8_FU"/>
<port_o id="in1" dir="IN">
<structural_type_descriptor type="INT" size="1"/>
Expand Down Expand Up @@ -1894,7 +1894,7 @@ assign out1 = {tmp_in8, tmp_in7, tmp_in6, tmp_in5, tmp_in4, tmp_in3, tmp_in2, tm
<description>This component is part of the BAMBU/PANDA IP LIBRARY</description>
<copyright>Copyright (C) 2004-2023 Politecnico di Milano</copyright>
<authors>Marco Lattuada &lt;[email protected]&gt;</authors>
<license>PANDA_GPLv3</license>
<license>PANDA_LGPLv3</license>
<structural_type_descriptor id_type="ui_concat_64_8_FU"/>
<port_o id="in1" dir="IN">
<structural_type_descriptor type="UINT" size="1"/>
Expand Down
2 changes: 1 addition & 1 deletion etc/scripts/test_panda.py
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ def CreatePerfPublisherBody(directory, pp_file):
parser.add_argument("--csv", help="Print the results in csv format")
parser.add_argument("--tool", help="The tool to be tested", default="bambu")
parser.add_argument("--ulimit", help="The ulimit options",
default="-f 8388608 -s 32768 -v 16777216")
default="-f 8388608 -s 32768 -v 33554432")
parser.add_argument("--stop", help="Stop the execution on first error (default=false)",
default=False, action="store_true")
parser.add_argument("--returnfail", help="Return FAILURE in case at least one test fails (default=false)",
Expand Down
2 changes: 2 additions & 0 deletions examples/panda_bench_sim_list
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@
--configuration-name=sha256 sha-256/sha-256.c --top-fname=calc_sha_256 --generate-tb=BENCHMARKS_ROOT/sha-256/test.xml --speculative-sdc-scheduling

--configuration-name=simple_asm simple_asm/asm.c --top-fname=main --generate-tb=BENCHMARKS_ROOT/simple_asm/test.xml --C-no-parse=BENCHMARKS_ROOT/simple_asm/c_stub.c

--configuration-name=aes MachSuite/aes/aes/aes.c MachSuite/common/harness.c --benchmark-name=aes --file-input-data=BENCHMARKS_ROOT/MachSuite/aes/aes/input.data,BENCHMARKS_ROOT/MachSuite/aes/aes/check.data --experimental-setup=BAMBU-PERFORMANCE-MP --top-fname=main --top-rtldesign-name=run_benchmark -mx32 -fno-tree-vectorize -DBAMBU_PROFILING
2 changes: 1 addition & 1 deletion src/BambuParameter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ int BambuParameter::Exec()
{"xilinx-root", optional_argument, nullptr, OPT_XILINX_ROOT},
{"verilator-parallel", optional_argument, nullptr, OPT_VERILATOR_PARALLEL},
{"shared-input-registers", no_argument, nullptr, OPT_SHARED_INPUT_REGISTERS},
{"inline-fname", no_argument, nullptr, OPT_INLINE_FUNCTIONS},
{"inline-fname", required_argument, nullptr, OPT_INLINE_FUNCTIONS},
GCC_LONG_OPTIONS,
{nullptr, 0, nullptr, 0}
};
Expand Down
5 changes: 4 additions & 1 deletion src/HLS/function_allocation/fun_dominator_allocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,10 @@ DesignFlowStep_Status fun_dominator_allocation::Exec()
INDENT_OUT_MEX(OUTPUT_LEVEL_MINIMUM, output_level,
"---Warning: " + fname + " is empty or the compiler killed all the statements");
}
INDENT_OUT_MEX(OUTPUT_LEVEL_MINIMUM, output_level, "---" + fname);
if(BH->has_implementation())
{
INDENT_OUT_MEX(OUTPUT_LEVEL_MINIMUM, output_level, "---" + fname);
}
if(!function_behavior->is_simple_pipeline())
{
HLSMgr->global_resource_constraints[std::make_pair(fname, WORK_LIBRARY)] = 1;
Expand Down
3 changes: 2 additions & 1 deletion src/wrapper/simulation/verilator/VerilatorWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ void VerilatorWrapper::GenerateScript(std::ostringstream& script, const std::str
script << std::endl << std::endl;
script << "ln -s " + output_directory + " " + SIM_SUBDIR + suffix + "/verilator_obj\n";

script << "make -C " + SIM_SUBDIR + suffix + "/verilator_obj -j";
script << "make -C " + SIM_SUBDIR + suffix + "/verilator_obj";
script << " -j " << std::thread::hardware_concurrency();
script << " OPT=\"-fstrict-aliasing\"";
script << " -f V" + top_filename + "_tb.mk V" + top_filename << "_tb";
#ifdef _WIN32
Expand Down

0 comments on commit 3b637ed

Please sign in to comment.