Merge/private (ferrandi#117)

* Modified testbench for new Memory_CTRL * Revert offchip write to posedge clock * updated MEMORY_CTRL and MEMORY_CTRLN * Minimal interface testbench generator refactoring * Updated buildin_wait_call_generator * Updated return_value_mm_registerN_FU * Simplified logic of builtin_wait_call generator * Updated open_verilog generator with new signals * Updated printf_generator with new signals * improved minimal interface testbench * Changed minimal interface to packed vector * Added backpressure to MEMORY_CTRL * Added back_prressure to MEMORY_CTRLN * Axi infer (ferrandi#304) * Added IOB modules to bambu library * Added support for pipelined write through cache AXI writes * Simplified AXI tb, added support for pipelined transactions * Added support to IOB caches in AXI module generator * Improved HLS_cache pragma handling * Added propagation of cache parameters to IOB cache * Added AXI cache flush operation * Added support for custom AXI backend bus size * Added error in case of invalid user-supplied bus size * Burst handling bugfixes * Added initial write back cache support * Removed mru policy support * Renamed cache parameter to match parameter actual meaning * Fixed axi queue handling * Fixed address/wstrb mismatch for non-default bus sizes * Added initial support for fully associative cache * Added new axi cache test cases, added new cases to test list * Improved management of function sharing/registered inputs management. * Added mmult tiled example --------- Co-authored-by: Giovanni Gozzi <[email protected]> Co-authored-by: Fabrizio Ferrandi <[email protected]> Co-authored-by: Claudio Barone <[email protected]> Co-authored-by: curzel <[email protected]>
jiangnan7 · Feb 15, 2023 · 7dfd8c8 · 7dfd8c8
1 parent 0609e51
commit 7dfd8c8
Show file tree

Hide file tree

Showing 56 changed files with 10,907 additions and 4,883 deletions.
diff --git a/etc/clang_plugin/plugin_ASTAnalyzer.cpp b/etc/clang_plugin/plugin_ASTAnalyzer.cpp
diff --git a/etc/lib/technology/C_MEM_IPs.xml b/etc/lib/technology/C_MEM_IPs.xml
diff --git a/etc/lib/technology/NC_HLS_IPs.xml b/etc/lib/technology/NC_HLS_IPs.xml
diff --git a/etc/lib/technology/NC_MEM_IPs.xml b/etc/lib/technology/NC_MEM_IPs.xml
diff --git a/examples/panda_bench_sim_list b/examples/panda_bench_sim_list
@@ -5,7 +5,7 @@
 --configuration-name=file_simulate file_simulate/module.c --top-fname=check_printf --benchmark-name=MEM_ACC_11 --experimental-setup=BAMBU --generate-tb=BENCHMARKS_ROOT/file_simulate/test.xml --file-input-data=BENCHMARKS_ROOT/file_simulate/test.xml --channels-type=MEM_ACC_11
 --configuration-name=file_simulate file_simulate/module.c --top-fname=check_printf --benchmark-name=MEM_ACC_NN --experimental-setup=BAMBU --generate-tb=BENCHMARKS_ROOT/file_simulate/test.xml --file-input-data=BENCHMARKS_ROOT/file_simulate/test.xml --channels-type=MEM_ACC_NN
 
---configuration-name=parallel_queries parallel_queries/common/atominIncrement.c parallel_queries/common/data.c parallel_queries/trinityq3/lubm_trinityq3.c --top-fname=search --compiler=I386_GCC49 --std=c99 --experimental-setup=BAMBU -O3 -fno-delete-null-pointer-checks -fopenmp --pragma-parse --mem-delay-read=20 --mem-delay-write=20 --channels-type=MEM_ACC_11 --memory-allocation-policy=NO_BRAM --device-name=xc7vx690t-3ffg1930-VVD --clock-period=10 -DMAX_VERTEX_NUMBER=26455 -DMAX_EDGE_NUMBER=100573 --benchmark-name=02W-04CH-2C-04CS -DN_THREADS=2 --num-accelerators=2 --memory-banks-number=4 --channels-number=2 --context_switch=4 -IBENCHMARKS_ROOT/parallel_queries/common/ --generate-tb=BENCHMARKS_ROOT/parallel_queries/trinityq3/test-1.xml
+--configuration-name=parallel_queries parallel_queries/common/atominIncrement.c parallel_queries/common/data.c parallel_queries/trinityq3/lubm_trinityq3.c --top-fname=search --compiler=I386_GCC49 --std=c99 --experimental-setup=BAMBU -O3 -fno-delete-null-pointer-checks -fopenmp --pragma-parse --mem-delay-read=20 --mem-delay-write=20 --channels-type=MEM_ACC_11 --memory-allocation-policy=NO_BRAM --device-name=xc7vx690t-3ffg1930-VVD --clock-period=10 -DMAX_VERTEX_NUMBER=26455 -DMAX_EDGE_NUMBER=100573 -DNDEBUG --benchmark-name=02W-04CH-2C-04CS -DN_THREADS=2 --num-accelerators=2 --memory-banks-number=4 --channels-number=2 --context_switch=4 -IBENCHMARKS_ROOT/parallel_queries/common/ --generate-tb=BENCHMARKS_ROOT/parallel_queries/trinityq3/test-1.xml
 
 --configuration-name=sha256 sha-256/sha-256.c --top-fname=calc_sha_256 --generate-tb=BENCHMARKS_ROOT/sha-256/test.xml --speculative-sdc-scheduling
 

diff --git a/examples/parallel_queries/bambu.sh b/examples/parallel_queries/bambu.sh
@@ -6,7 +6,7 @@ mkdir -p parallel_queries_sim
 cd parallel_queries_sim
 
 #!/bin/bash
-timeout 2h bambu --simulator=MODELSIM --compiler=I386_GCC49 --std=c99 --experimental-setup=BAMBU -O3 -fno-delete-null-pointer-checks -fopenmp --pragma-parse --mem-delay-read=20 --mem-delay-write=20 --channels-type=MEM_ACC_11 --memory-allocation-policy=NO_BRAM --no-iob --device-name=xc7vx690t-3ffg1930-VVD --clock-period=10 -DMAX_VERTEX_NUMBER=26455 -DMAX_EDGE_NUMBER=100573 --configuration-name=02W-04CH-2C-04CS -DN_THREADS=2  --num-accelerators=2  --memory-banks-number=4  --channels-number=2 --context_switch=4 ${root_dir}/common/atominIncrement.c ${root_dir}/common/data.c -I${root_dir}/common/ --benchmark-name=tq1-1DB  --generate-tb=${root_dir}/trinityq3/test-1.xml  ${root_dir}/trinityq3/lubm_trinityq3.c --top-fname=search --simulate "$@"
+timeout 2h bambu --simulator=MODELSIM --compiler=I386_GCC49 --std=c99 --experimental-setup=BAMBU -O3 -fno-delete-null-pointer-checks -fopenmp --pragma-parse --mem-delay-read=20 --mem-delay-write=20 --channels-type=MEM_ACC_11 --memory-allocation-policy=NO_BRAM --no-iob --device-name=xc7vx690t-3ffg1930-VVD --clock-period=10 -DMAX_VERTEX_NUMBER=26455 -DMAX_EDGE_NUMBER=100573 -DNDEBUG --configuration-name=02W-04CH-2C-04CS -DN_THREADS=2  --num-accelerators=2  --memory-banks-number=4  --channels-number=2 --context_switch=4 ${root_dir}/common/atominIncrement.c ${root_dir}/common/data.c -I${root_dir}/common/ --benchmark-name=tq1-1DB  --generate-tb=${root_dir}/trinityq3/test-1.xml  ${root_dir}/trinityq3/lubm_trinityq3.c --top-fname=search --simulate "$@"
 return_value=$?
 if test $return_value != 0; then
    exit $return_value

diff --git a/examples/parallel_queries/context_switch_xilinx_10_1DB_simulate.sh b/examples/parallel_queries/context_switch_xilinx_10_1DB_simulate.sh
@@ -8,7 +8,7 @@ if [[ "$compiler" != *GCC* ]]; then
    exit 0
 fi
 
-BATCH_ARGS=("--simulator=MODELSIM" "--std=c99" "--experimental-setup=BAMBU" "-O3" "-fno-delete-null-pointer-checks" "-fopenmp" "--pragma-parse" "--mem-delay-read=20" "--mem-delay-write=20" "--channels-type=MEM_ACC_11" "--memory-allocation-policy=NO_BRAM" "--no-iob" "-DMAX_VERTEX_NUMBER=26455" "-DMAX_EDGE_NUMBER=100573" "--simulate")
+BATCH_ARGS=("--simulator=MODELSIM" "--std=c99" "--experimental-setup=BAMBU" "-O3" "-fno-delete-null-pointer-checks" "-fopenmp" "--pragma-parse" "--mem-delay-read=20" "--mem-delay-write=20" "--channels-type=MEM_ACC_11" "--memory-allocation-policy=NO_BRAM" "--no-iob" "-DMAX_VERTEX_NUMBER=26455" "-DMAX_EDGE_NUMBER=100573" "-DNDEBUG" "--simulate")
 OUT_SUFFIX="parallel_queries_1DB"
 
 python3 $script_dir/../../etc/scripts/test_panda.py --tool=bambu  \

diff --git a/examples/parallel_queries/context_switch_xilinx_10_40DB_simulate.sh b/examples/parallel_queries/context_switch_xilinx_10_40DB_simulate.sh
@@ -8,7 +8,7 @@ if [[ "$compiler" != *GCC* ]]; then
    exit 0
 fi
 
-BATCH_ARGS=("--simulator=MODELSIM" "--std=c99" "--experimental-setup=BAMBU" "-O3" "-fno-delete-null-pointer-checks" "-fopenmp" "--pragma-parse" "--mem-delay-read=20" "--mem-delay-write=20" "--channels-type=MEM_ACC_11" "--memory-allocation-policy=NO_BRAM" "--no-iob" "-DMAX_VERTEX_NUMBER=26455" "-DMAX_EDGE_NUMBER=100573" "--max-sim-cycles=2000000000" "--simulate")
+BATCH_ARGS=("--simulator=MODELSIM" "--std=c99" "--experimental-setup=BAMBU" "-O3" "-fno-delete-null-pointer-checks" "-fopenmp" "--pragma-parse" "--mem-delay-read=20" "--mem-delay-write=20" "--channels-type=MEM_ACC_11" "--memory-allocation-policy=NO_BRAM" "--no-iob" "-DMAX_VERTEX_NUMBER=26455" "-DMAX_EDGE_NUMBER=100573" "-DNDEBUG" "--max-sim-cycles=2000000000" "--simulate")
 OUT_SUFFIX="parallel_queries_40DB"
 
 python3 $script_dir/../../etc/scripts/test_panda.py --tool=bambu  \

diff --git a/examples/parallel_queries/temp.txt b/examples/parallel_queries/temp.txt