undo more hacks

nod-ai · Aug 22, 2024 · c85d95a · c85d95a
1 parent ff5c67a
commit c85d95a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/build_tools/ci/cpu_comparison/run_test.py b/build_tools/ci/cpu_comparison/run_test.py
@@ -635,7 +635,8 @@ def run(self, config):
         test_name = output_dir / "test_from_template_bias_N.mlir"
         template_name = matmul_template_dir / "matmul_bias_MxK_KxN_N.mlir"
         generate_matmul_test(test_name, template_name, 1024, 1024, 512, "bf16", "f32")
-        # aie_vs_llvm_cpu(config, test_name, tile_pipeline="pack-peel", use_ukernel=True)
+        if config.vitis_dir:
+            aie_vs_llvm_cpu(config, test_name, tile_pipeline="pack-peel", use_ukernel=True)
         aie_vs_llvm_cpu(config, test_name, tile_pipeline="pack-peel", use_ukernel=False)
 
         # Test(s) of the form matmul(A,B) + C where A:MxK, B:KxN, C:MxN
@@ -671,16 +672,16 @@ def run(self, config):
         )
 
         # Using objectFifo pipeline
-        # matmul_template_dir = file_dir / "matmul_template"
-        # test_name = output_dir / "test_from_objectfifo_basic.mlir"
-        # template_name = matmul_template_dir / "matmul_MxK_KxN.mlir"
-        # generate_matmul_test(test_name, template_name, 64, 64, 64, "bf16", "f32")
-        # aie_vs_llvm_cpu(
-        #     config,
-        #     test_name,
-        #     tile_pipeline="pack-peel",
-        #     lower_to_aie_pipeline="objectFifo",
-        # )
+        matmul_template_dir = file_dir / "matmul_template"
+        test_name = output_dir / "test_from_objectfifo_basic.mlir"
+        template_name = matmul_template_dir / "matmul_MxK_KxN.mlir"
+        generate_matmul_test(test_name, template_name, 64, 64, 64, "bf16", "f32")
+        aie_vs_llvm_cpu(
+            config,
+            test_name,
+            tile_pipeline="pack-peel",
+            lower_to_aie_pipeline="objectFifo",
+        )
 
 
 def get_test_partition():

diff --git a/build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh b/build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh
@@ -103,7 +103,6 @@ else
   exit 1
 fi
 
-
 THIS="$(cd $(dirname $0) && pwd)"
 SOURCE_MLIR_FILE="${THIS}/linalg_matmul_f32.mlir"
 

diff --git a/build_tools/ci/run_matmul_test.sh b/build_tools/ci/run_matmul_test.sh
@@ -878,14 +878,14 @@ if [ -d "$VITIS" ]; then
       --num_repeat_runs "2" \
       --use_ukernel "1"
 
-run_matmul_test_on_shapes ${bf16_ukernel_shapes_medium[@]} \
-    --name_prefix "medium" \
-    --lower_to_aie_pipeline "objectFifo" \
-    --tile_pipeline "pack-peel" \
-    --lhs_rhs_type "bf16" \
-    --acc_type "f32" \
-    --num_repeat_runs "2" \
-    --use_ukernel "1"
+  run_matmul_test_on_shapes ${bf16_ukernel_shapes_medium[@]} \
+      --name_prefix "medium" \
+      --lower_to_aie_pipeline "objectFifo" \
+      --tile_pipeline "pack-peel" \
+      --lhs_rhs_type "bf16" \
+      --acc_type "f32" \
+      --num_repeat_runs "2" \
+      --use_ukernel "1"
 fi
 
 ###################################################################
@@ -894,26 +894,26 @@ fi
 
 if [ -d "$VITIS" ]; then
 
-run_matmul_test \
-    --name_prefix "chess_i32_matmul" \
-    --lhs_rhs_type "i32" \
-    --acc_type "i32" \
-    --m "32" \
-    --n "32" \
-    --k "32" \
-    --use_chess "1" \
-    --num_repeat_runs "10"
+  run_matmul_test \
+      --name_prefix "chess_i32_matmul" \
+      --lhs_rhs_type "i32" \
+      --acc_type "i32" \
+      --m "32" \
+      --n "32" \
+      --k "32" \
+      --use_chess "1" \
+      --num_repeat_runs "10"
 
-run_matmul_test \
-    --name_prefix "chess_bf16_ukernel" \
-    --lhs_rhs_type "bf16" \
-    --acc_type "f32" \
-    --m "64" \
-    --n "64" \
-    --k "64" \
-    --use_chess "1" \
-    --num_repeat_runs "10" \
-    --use_ukernel "1"
+  run_matmul_test \
+      --name_prefix "chess_bf16_ukernel" \
+      --lhs_rhs_type "bf16" \
+      --acc_type "f32" \
+      --m "64" \
+      --n "64" \
+      --k "64" \
+      --use_chess "1" \
+      --num_repeat_runs "10" \
+      --use_ukernel "1"
 
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,6 @@ else @@
       exit 1
     fi
     THIS="$(cd $(dirname $0) && pwd)"
     SOURCE_MLIR_FILE="${THIS}/linalg_matmul_f32.mlir"
@@ Expand Down @@