Dense RV hacks + two input add

aha/util/pnr.py

@@ -111,8 +111,10 @@ def dispatch(args, extra_args=None):
         "--gold-file",
         str(app_dir / f"bin/gold{ext}"),
         "--input-broadcast-branch-factor", "2",
-        "--input-broadcast-max-leaves", "4",
-        "--pipeline-pnr"
+        # MO: DRV HACK 
+        "--no-input-broadcast-pipelining",
+        "--input-broadcast-max-leaves", "4"
+        #"--pipeline-pnr"
     ]
 
     need_daemon = False

aha/util/regress.py

@@ -323,8 +323,16 @@ def test_dense_app(test, width, height, env_parameters, extra_args, layer=None,
     except:
         pass
 
+    # MO: DRV HACK 
+    env_vars = {}
+    env=env_vars
+    dense_ready_valid = True 
+    if dense_ready_valid:
+        env_vars["PIPELINED"] = "0"
+        env_vars["MATCH_BRANCH_DELAY"] = "0"
+
     start = time.time()
-    buildkite_call(["aha", "map", test, "--chain", "--env-parameters", env_parameters] + layer_array)
+    buildkite_call(["aha", "map", test, "--chain", "--env-parameters", env_parameters] + layer_array, env=env_vars)
     time_compile = time.time() - start
 
     print(f"--- {testname} - pnr and pipelining", flush=True)
@@ -351,6 +359,9 @@ def test_dense_app(test, width, height, env_parameters, extra_args, layer=None,
 
     env_vars = {}
 
+    # MO: DRV HACK, temporarily setting this so FIFOs are placed properly 
+    #env_vars["EXHAUSTIVE_PIPE"] = "1"
+
     if using_matrix_unit:
         buildkite_args.append("--using-matrix-unit")
         buildkite_args.append("--give-north-io-sbs")
@@ -364,8 +375,9 @@ def test_dense_app(test, width, height, env_parameters, extra_args, layer=None,
         env_vars["OC_0"] = str(2*cgra_height)
         env_vars["MU_DATAWIDTH"] = str(mu_datawidth)
 
-    buildkite_call(buildkite_args)
-
+    #buildkite_call(buildkite_args)
+
+    buildkite_call(buildkite_args, env=env_vars)
     time_map = time.time() - start
 
     print(f"--- {testname} - glb testing", flush=True)
@@ -468,6 +480,41 @@ def test_hardcoded_dense_app(test, width, height, env_parameters, extra_args, la
 
     return time_compile, time_map, time_test
 
+def test_matrix_unit_app(test, width, height, env_parameters, extra_args, layer=None, dense_only=False, use_fp=False, using_matrix_unit=False, cgra_height=32, mu_datawidth=16, num_fabric_cols_removed=0):
+    env_parameters = str(env_parameters)
+    testname = layer if layer is not None else test
+    print(f"--- {testname}")
+    print(f"--- {testname} - Skipping compiling and mapping")
+    app_path = "/aha/Halide-to-Hardware/apps/hardware_benchmarks/" + test
+    print(app_path, flush=True)
+
+    print(f"--- {testname} - Skipping pnr and pipelining", flush=True)
+
+    env_vars = {}
+    if using_matrix_unit:
+        # buildkite_args.append("--using-matrix-unit")
+        # buildkite_args.append("--give-north-io-sbs")
+        # buildkite_args.append("--num-fabric-cols-removed")
+        # buildkite_args.append(str(num_fabric_cols_removed))
+
+        if num_fabric_cols_removed == 0: 
+            env_vars["WEST_IN_IO_SIDES"] = "1"
+
+        env_vars["USING_MATRIX_UNIT"] = "1"
+        env_vars["OC_0"] = str(2*cgra_height)
+        env_vars["MU_DATAWIDTH"] = str(mu_datawidth)
+
+    #buildkite_call(buildkite_args)
+
+    print(f"--- {testname} - glb testing", flush=True)
+    start = time.time()
+    if use_fp:
+        buildkite_call(["aha", "test", test, "--dense-fp"], env=env_vars)
+    else:
+        buildkite_call(["aha", "test", test], env=env_vars)
+    time_test = time.time() - start
+
+    return 0, 0, time_test
 
 def dispatch(args, extra_args=None):
     seed_flow = not args.non_seed_flow
@@ -522,6 +569,7 @@ def dispatch(args, extra_args=None):
     resnet_tests = imported_tests.resnet_tests
     resnet_tests_fp = imported_tests.resnet_tests_fp
     hardcoded_dense_tests = imported_tests.hardcoded_dense_tests
+    matrix_unit_tests = imported_tests.matrix_unit_tests
 
     print(f"--- Running regression: {args.config}", flush=True)
     info = []
@@ -627,6 +675,12 @@ def dispatch(args, extra_args=None):
                                     using_matrix_unit=using_matrix_unit, cgra_height=height, mu_datawidth=mu_datawidth, num_fabric_cols_removed=num_fabric_cols_removed)
         info.append([test + "_glb", t0 + t1 + t2, t0, t1, t2])
 
+    for test in matrix_unit_tests:
+        t0, t1, t2 = test_matrix_unit_app(test, 
+                                    width, height, args.env_parameters, extra_args, 
+                                    using_matrix_unit=using_matrix_unit, cgra_height=height, mu_datawidth=mu_datawidth, num_fabric_cols_removed=num_fabric_cols_removed)
+        info.append([test + "_glb", t0 + t1 + t2, t0, t1, t2])
+
     if args.include_dense_only_tests:
         # DENSE ONLY TESTS
         # Remove sparse+dense garnet.v first 

aha/util/regress_tests/tests.py

@@ -10,22 +10,27 @@ def __init__(self, testname):
         resnet_tests = []
         resnet_tests_fp = []
         hardcoded_dense_tests = []
+        matrix_unit_tests = []
 
         # FAST test suite should complete in just a minute or two
         if testname == "fast":
             width, height = 8, 8,
             sparse_tests = [
-                "vec_identity"
+                # "vec_identity"
             ]
             glb_tests = [
-                "apps/pointwise"
+                # "apps/two_input_add",
+                # "apps/pointwise"
             ]
             glb_tests_fp = [
-                "tests/fp_pointwise",
+                # "tests/fp_pointwise",
             ]
             resnet_tests = []
             resnet_tests_fp = []
             hardcoded_dense_tests = []
+            matrix_unit_tests = [
+                "apps/two_input_add"
+            ]
 
         # PR_AHA test suite for aha-repo push/pull
         elif testname == "pr_aha":
@@ -80,6 +85,7 @@ def __init__(self, testname):
             hardcoded_dense_tests = [
                 "apps/depthwise_conv"
             ]
+            matrix_unit_tests = []
 
 # Found the better way maybe
 # 
@@ -159,6 +165,7 @@ def __init__(self, testname):
             hardcoded_dense_tests = [
                 "apps/depthwise_conv"
             ]
+            matrix_unit_tests = []
 
         # FULL test is used by scheduled weekly aha regressions
         elif testname == "full":
@@ -273,6 +280,7 @@ def __init__(self, testname):
             hardcoded_dense_tests = [
                 "apps/depthwise_conv"
             ]
+            matrix_unit_tests = []
         elif testname == "resnet":
             width, height = 28, 16
             sparse_tests = []
@@ -294,6 +302,7 @@ def __init__(self, testname):
             ]
             resnet_tests_fp = []
             hardcoded_dense_tests = []
+            matrix_unit_tests = []
 
         # BLANK can be used to return default height, width, and blank test lists
         elif testname == "BLANK":
@@ -309,3 +318,4 @@ def __init__(self, testname):
         self.resnet_tests = resnet_tests
         self.resnet_tests_fp = resnet_tests_fp
         self.hardcoded_dense_tests = hardcoded_dense_tests
+        self.matrix_unit_tests = matrix_unit_tests