merge main

StanfordAHA · Dec 7, 2024 · a853929 · a853929
2 parents ba1c4ee + f58777a
commit a853929
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 35 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -60,7 +60,7 @@
     branch = master
 [submodule "archipelago"]
     path = archipelago
-	url = https://github.com/kuree/archipelago
+	url = https://github.com/mcoduoza/archipelago
 	branch = master 
 [submodule "cgra_pnr"]
     path = cgra_pnr

diff --git a/Dockerfile b/Dockerfile
@@ -90,7 +90,7 @@ RUN source bin/activate && \
   pip install urllib3==1.26.15 && \
   pip install wheel six && \
   pip install systemrdl-compiler peakrdl-html && \
-  pip install packaging==21.3 && \
+  pip install packaging && \
   pip install importlib_resources && \
   echo DONE
 

diff --git a/aha/util/application_parameters.json b/aha/util/application_parameters.json
@@ -120,6 +120,44 @@
             "SWEEP_PNR_PLACER_EXP":"1"
         }
     },
+    "apps/maxpooling":{
+        "default":{
+            "HALIDE_GEN_ARGS":"in_img=58 ksize=3 stride=2 n_ic=56 unroll=7",
+            "HL_TARGET":"host-x86-64",
+            "DISABLE_GP":"1",
+            "PNR_PLACER_EXP":"15"
+        },
+        "fastest":{
+            "HALIDE_GEN_ARGS":"in_img=58 ksize=3 stride=2 n_ic=56 unroll=7",
+            "HL_TARGET":"host-x86-64",
+            "DISABLE_GP":"1"
+        },
+        "sweep":{
+            "HALIDE_GEN_ARGS":"in_img=58 ksize=3 stride=2 n_ic=56 unroll=7",
+            "HL_TARGET":"host-x86-64",
+            "DISABLE_GP":"1",
+            "SWEEP_PNR_PLACER_EXP":"1"
+        }
+    },
+    "apps/maxpooling_fp":{
+        "default":{
+            "HALIDE_GEN_ARGS":"in_img=29 ksize=3 stride=2 n_ic=28 unroll=7",
+            "HL_TARGET":"host-x86-64-bfloat_hardware",
+            "DISABLE_GP":"1",
+            "PNR_PLACER_EXP":"6"
+        },
+        "fastest":{
+            "HALIDE_GEN_ARGS":"in_img=29 ksize=3 stride=2 n_ic=28 unroll=7",
+            "HL_TARGET":"host-x86-64-bfloat_hardware",
+            "DISABLE_GP":"1"
+        },
+        "sweep":{
+            "HALIDE_GEN_ARGS":"in_img=29 ksize=3 stride=2 n_ic=28 unroll=7",
+            "HL_TARGET":"host-x86-64-bfloat_hardware",
+            "DISABLE_GP":"1",
+            "SWEEP_PNR_PLACER_EXP":"1"
+        }
+    },
     "conv1":{
         "default":{
             "HALIDE_GEN_ARGS":"in_img=32 pad=3 ksize=7 stride=2 n_ic=3 n_oc=64 k_ic=3 k_oc=4",

diff --git a/aha/util/regress.py b/aha/util/regress.py
diff --git a/aha/util/regress_tests/tests.py b/aha/util/regress_tests/tests.py
@@ -60,6 +60,7 @@ def __init__(self, testname):
                 "tensor3_ttv",        
             ]
             glb_tests = [
+                "apps/maxpooling",
                 "apps/pointwise",
                 "apps/gaussian",
                 "apps/camera_pipeline_2x2",
@@ -207,6 +208,7 @@ def __init__(self, testname):
 
             ]
             glb_tests = [
+                "apps/maxpooling",
                 "apps/pointwise",
                 "tests/rom",
                 "tests/arith",
@@ -231,15 +233,14 @@ def __init__(self, testname):
                 "apps/unsharp",
                 "apps/harris_color",
                 "apps/camera_pipeline_2x2",
-                "apps/maxpooling",
                 "apps/matrix_multiplication"
             ]
             glb_tests_fp = [
+                "apps/maxpooling_fp",
                 "tests/fp_pointwise",
                 "tests/fp_arith",
                 "tests/fp_comp",
                 "tests/fp_conv_7_7",
-                "apps/maxpooling_fp",
                 "apps/matrix_multiplication_fp",
                 "apps/mcunet_in_sequential_0_fp",
                 "apps/depthwise_conv_stream_fp",

diff --git a/aha/util/test.py b/aha/util/test.py
@@ -107,6 +107,15 @@ def dispatch(args, extra_args=None):
     if args.sparse:
 
         try:
+
+            subprocess_call_log (
+                    cmd=["make", "clean_sparse_outputs"],
+                    cwd=str(args.aha_dir / "garnet" / "tests" / "test_app"),
+                    env=env,
+                    log=args.log,
+                    log_file_path=log_file_path
+            )
+
             if args.run:
                 subprocess_call_log (
                     cmd=["make", "run"] + extra_args,

diff --git a/archipelago b/archipelago
diff --git a/canal b/canal
diff --git a/garnet b/garnet
diff --git a/lake b/lake
diff --git a/sam b/sam
+6 −7		archipelago/pipeline.py
+6 −1		archipelago/pnr_.py
+0 −1		archipelago/pnr_graph.py
+18 −16		archipelago/sta.py
+1 −0		canal/cyclone.py
+4 −3		canal/global_signal.py
+2 −0		canal/interconnect.py
+19 −11		canal/util.py
+22 −11		cgra/util_onyx.py
+38 −6		cgra/wiring_onyx.py
+81 −21		garnet.py
+2 −2		global_buffer/design/global_buffer.py
+3 −0		global_buffer/design/global_buffer_parameter.py
+14 −7		global_buffer/io_placement.py
+1 −0		global_controller/global_controller_genesis2.py
+4 −2		global_controller/global_controller_magma.py
+2 −1		global_controller/rtl/genesis/glc_axi_addrmap.svp
+4 −3		global_controller/rtl/genesis/glc_jtag_ctrl.svp
+3 −2		global_controller/rtl/genesis/global_controller.svp
+1 −1		mapper/netlist_graph.py
+13 −13		mapper/netlist_util.py
+5 −9		memory_core/core_combiner_core.py
+38 −29		memory_core/memtile_util.py
+136 −0		memory_core/mu2f_io_core_rv.py
+2 −12		mflowgen/bin/setup-buildkite.sh
+3 −0		mflowgen/common/rtl/gen_rtl.sh
+30 −0		mflowgen/setup-garnet.sh
+13 −4		passes/interconnect_port_pass/interconnect_port_pass.py
+10 −1		tests/test_app/Makefile
+141 −0		tests/test_app/genesis_tb/top.svp
+30 −3		tests/test_app/lib/map.c
+11 −2		tests/test_app/lib/parser.c
+12 −8		tests/test_app/tb/environment.sv
+60 −5		tests/test_app/tb/top.sv
+911 −970		tests/test_memory_core/build_tb.py
+1 −1		lake/modules/buffet_like.py
+38 −38		lake/modules/crddrop.py
+3 −4		lake/modules/intersect.py
+348 −0		lake/modules/mu2f_io_core.py
+36 −0		lake/modules/mux.py
+12 −16		lake/modules/pass_through.py
+2 −3		lake/modules/reg_cr.py
+11 −11		lake/modules/repeat.py
+3 −3		lake/modules/repeat_signal_generator.py
+92 −93		lake/modules/scanner_pipe.py
+3 −3		lake/modules/stream_arbiter.py
+10 −10		lake/modules/write_scanner.py
+15 −101		lake/top/core_combiner.py
+7 −10		lake/top/fiber_access.py
+2 −8		lake/top/memtile_builder.py
+1 −1		setup.cfg
+199 −0		tests/Makefile
+7 −0		tests/dump_fsdb.tcl
+161 −0		tests/mu2f_io_core_tb.sv
+1 −1		.github/workflows/makefile.yml
+1 −1		.github/workflows/python-package-conda.yml
+1 −1		sam/onyx/hw_nodes/buffet_node.py
+1 −7		sam/onyx/hw_nodes/compute_node.py
+1 −17		sam/onyx/hw_nodes/crdhold_node.py
+2 −40		sam/onyx/hw_nodes/fiberaccess_node.py
+0 −2		sam/onyx/hw_nodes/glb_node.py
+1 −17		sam/onyx/hw_nodes/intersect_node.py
+1 −7		sam/onyx/hw_nodes/merge_node.py
+3 −11		sam/onyx/hw_nodes/pass_through_node.py
+1 −7		sam/onyx/hw_nodes/read_scanner_node.py
+1 −3		sam/onyx/hw_nodes/reduce_node.py
+1 −6		sam/onyx/hw_nodes/repeat_node.py
+1 −0		sam/onyx/hw_nodes/repsiggen_node.py
+1 −2		sam/onyx/hw_nodes/stream_arbiter_node.py
+1 −1		sam/onyx/hw_nodes/write_scanner_node.py
+24 −18		sam/onyx/parse_dot.py