Added further tests.

ferrandi · Nov 27, 2023 · 36f24f5 · 36f24f5
1 parent 122709f
commit 36f24f5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 34 deletions.
diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml
@@ -737,7 +737,7 @@ jobs:
 
   memarch-tests:
     needs: [build, CHStone-multi]
-    runs-on: [self-hosted, xilinx]
+    runs-on: [self-hosted, mentor]
     strategy:
       fail-fast: false
       matrix:
@@ -754,14 +754,14 @@ jobs:
           - compiler: I386_CLANG13
             script: generic_CHStone-memarch2.sh
             args: -c=-wH
-          - compiler: I386_GCC7
+          - compiler: I386_CLANG11
             script: generic_gcc-memarch3.sh
             args: ""
-          - compiler: I386_GCC7
+          - compiler: I386_CLANG11
             script: generic_gcc-memarch3.sh
             args: -c=-wH
     env:
-      args: -c=--simulator=XSIM -c=--assert-debug -c=--compiler=${{matrix.compiler}} ${{matrix.args}}
+      args: -c=--simulator=MODELSIM -c=--assert-debug -c=--compiler=${{matrix.compiler}} ${{matrix.args}}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/panda_regressions/hls/gcc_memarch_list3 b/panda_regressions/hls/gcc_memarch_list3
@@ -1 +1,2 @@
 gcc_regression_simple/20000422-1.c
+gcc_regression_simple/20000722-1.c
diff --git a/panda_regressions/hls/generic_gcc-memarch3.sh b/panda_regressions/hls/generic_gcc-memarch3.sh
@@ -4,39 +4,39 @@ script_dir="$(dirname $(readlink -e $0))"
 ggo_require_compiler=1
 . $script_dir/generic_getopt.sh
 
-BATCH_ARGS=("--simulate" "-O2" "-fwhole-program" "--experimental-setup=BAMBU" "--clock-period=15" "-D'printf(fmt, ...)='")
+BATCH_ARGS=("--simulate" "-O1" "-fwhole-program" "--experimental-setup=BAMBU" "--clock-period=15" "-D'printf(fmt, ...)='")
 OUT_SUFFIX="${compiler}_gcc-memarch3"
 
 python3 $script_dir/../../etc/scripts/test_panda.py --tool=bambu \
-   --args="--configuration-name=${compiler}-O2-wp-11-aligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-aligned-ALL-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-aligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-aligned-ALL-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-aligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-aligned-ALL-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-unaligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --unaligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-unaligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --unaligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-unaligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --unaligned-access ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-aligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-aligned-ALL-bhl3-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-aligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-aligned-ALL-bhl3-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-aligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-aligned-ALL-bhl3-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-unaligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --unaligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-unaligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --unaligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-unaligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --unaligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-aligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-aligned-ALL-bhl4-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-aligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-aligned-ALL-bhl4-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-aligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-aligned-ALL-bhl4-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-11-unaligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --unaligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-N1-unaligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --unaligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-NN-unaligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --unaligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-VVD-NN-LSS --memory-allocation-policy=LSS --channels-type=MEM_ACC_NN ${BATCH_ARGS[*]}"\
-   --args="--configuration-name=${compiler}-O2-wp-VVD-NN-GSS --memory-allocation-policy=GSS --channels-type=MEM_ACC_NN ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-aligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-aligned-ALL-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-aligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-aligned-ALL-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-aligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-aligned-ALL-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-unaligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --unaligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-unaligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --unaligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-unaligned-ALL --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --unaligned-access ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-aligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-aligned-ALL-bhl3-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-aligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-aligned-ALL-bhl3-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-aligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-aligned-ALL-bhl3-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-unaligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --unaligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-unaligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --unaligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-unaligned-ALL-bhl3 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --unaligned-access --bram-high-latency=3 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-aligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-aligned-ALL-bhl4-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-aligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-aligned-ALL-bhl4-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-aligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-aligned-ALL-bhl4-NODIST --do-not-use-asynchronous-memories --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --aligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-11-unaligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_11 --unaligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-N1-unaligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_N1 --unaligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-NN-unaligned-ALL-bhl4 --memory-allocation-policy=ALL_BRAM --channels-type=MEM_ACC_NN --unaligned-access --bram-high-latency=4 ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-VVD-NN-LSS --memory-allocation-policy=LSS --channels-type=MEM_ACC_NN ${BATCH_ARGS[*]}"\
+   --args="--configuration-name=${compiler}-O1-wp-VVD-NN-GSS --memory-allocation-policy=GSS --channels-type=MEM_ACC_NN ${BATCH_ARGS[*]}"\
    -l${script_dir}/gcc_memarch_list3 \
    -o "out_${OUT_SUFFIX}" -b$script_dir \
    --name="${OUT_SUFFIX}" $ARGS
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		gcc_regression_simple/20000422-1.c
		gcc_regression_simple/20000722-1.c