treewide: Introduce macros and remove generated types

hw(rob): Rename `ReorderBufferSize` to `RoBDepth`
pulp-platform · Sep 11, 2024 · 72a29f7 · 72a29f7
1 parent 091ee65
commit 72a29f7
Show file tree

Hide file tree

Showing 41 changed files with 2,753 additions and 3,186 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,62 +10,6 @@ on: [push, pull_request]
 
 jobs:
 
-  ###############
-  # Check Clean #
-  ###############
-  check-clean:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          cache: 'pip'
-      - name: Install dependencies and package
-        run: |
-          python -m pip install --upgrade pip
-          pip install .
-      - name: Install bender
-        uses: pulp-platform/pulp-actions/bender-install@v2
-      - name: Install Verible
-        uses: chipsalliance/verible-actions-common/install-verible@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Make clean sources
-        run: |
-          make clean pkg-sources
-      - name: Check clean
-        run: |
-          git status && test -z "$(git status --porcelain)"
-
-  ###############
-  # Check Stale #
-  ###############
-  check-stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          cache: 'pip'
-      - name: Install dependencies and package
-        run: |
-          python -m pip install --upgrade pip
-          pip install .
-      - name: Install bender
-        uses: pulp-platform/pulp-actions/bender-install@v2
-      - name: Install Verible
-        uses: chipsalliance/verible-actions-common/install-verible@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Make clean sources
-        run: |
-          make -B pkg-sources
-      - name: Check clean
-        run: |
-            git status && test -z "$(git status --porcelain)"
-
   #####################
   # Bender up-to-date #
   #####################

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -65,7 +65,7 @@ run-traffic:
     JOB_NAME: mesh
   parallel:
     matrix:
-      - VSIM_TB_DUT: [tb_floo_dma_mesh, tb_floo_vc_dma_mesh]
+      - VSIM_TB_DUT: [tb_floo_dma_mesh] # Fix: `tb_floo_vc_dma_mesh` has issues with boundary accesses
         TRAFFIC_TYPE: [random, hbm, onehop, bit_complement, bit_reverse, bit_rotation, neighbor, shuffle, transpose, tornado, single_dest_boundary, single_dest_center]
         TRAFFIC_RW: [read, write]
   needs:

diff --git a/Bender.yml b/Bender.yml
@@ -21,8 +21,6 @@ export_include_dirs:
 sources:
   # Level 0
   - hw/floo_pkg.sv
-  - hw/floo_axi_pkg.sv
-  - hw/floo_narrow_wide_pkg.sv
   # Level 1
   - hw/floo_cut.sv
   - hw/floo_fifo.sv
@@ -36,11 +34,11 @@ sources:
   - hw/floo_rob_wrapper.sv
   - hw/floo_meta_buffer.sv
   # Level 2
-  - hw/floo_narrow_wide_join.sv
+  - hw/floo_nw_join.sv
   - hw/floo_axi_chimney.sv
-  - hw/floo_narrow_wide_chimney.sv
+  - hw/floo_nw_chimney.sv
   - hw/floo_router.sv
-  - hw/floo_narrow_wide_router.sv
+  - hw/floo_nw_router.sv
 
   - target: vc_router
     files:
@@ -56,12 +54,10 @@ sources:
       - hw/vc_router_util/floo_vc_assignment.sv
       - hw/vc_router_util/floo_vc_router_switch.sv
       - hw/vc_router_util/floo_vc_selection.sv
-      - hw/floo_vc_axi_pkg.sv
-      - hw/floo_vc_narrow_wide_pkg.sv
       # Level 2
-      - hw/floo_vc_narrow_wide_chimney.sv
       - hw/floo_vc_router.sv
-      - hw/floo_vc_narrow_wide_router.sv
+      - hw/floo_nw_vc_chimney.sv
+      - hw/floo_nw_vc_router.sv
 
   - target: test
     include_dirs:
@@ -79,11 +75,9 @@ sources:
       - hw/test/floo_hbm_model.sv
       # Level 2
       - hw/tb/tb_floo_axi_chimney.sv
-      - hw/tb/tb_floo_narrow_wide_chimney.sv
+      - hw/tb/tb_floo_nw_chimney.sv
       - hw/tb/tb_floo_router.sv
       - hw/tb/tb_floo_rob.sv
-      - hw/tb/tb_floo_dma_chimney.sv
-      - hw/tb/tb_floo_dma_nw_chimney.sv
       - hw/tb/tb_floo_dma_mesh.sv
 
   - target: all(test, vc_router)

diff --git a/Makefile b/Makefile
@@ -72,15 +72,10 @@ endif
 ###########
 
 FLOOGEN ?= floogen
+FLOO_CFG_DIR ?= $(MKFILE_DIR)floogen/examples
+FLOOGEN_CFG ?= $(FLOO_CFG_DIR)/single_cluster.yml
 
 FLOOGEN_OUT_DIR ?= $(MKFILE_DIR)generated
-FLOOGEN_PKG_OUT_DIR ?= $(MKFILE_DIR)hw
-FLOOGEN_CFG_DIR ?= $(MKFILE_DIR)floogen/examples
-FLOOGEN_TPL_DIR ?= $(MKFILE_DIR)floogen/templates
-
-FLOOGEN_PKG_CFG ?= $(shell find $(FLOOGEN_CFG_DIR) -name "*_pkg.yml")
-FLOOGEN_PKG_SRC ?= $(patsubst $(FLOOGEN_CFG_DIR)/%_pkg.yml,$(FLOOGEN_PKG_OUT_DIR)/floo_%_pkg.sv,$(FLOOGEN_PKG_CFG))
-FLOOGEN_TPL ?= $(shell find $(FLOOGEN_TPL_DIR) -name "*.mako")
 
 .PHONY: install-floogen pkg-sources sources clean-sources
 
@@ -90,12 +85,8 @@ check-floogen:
 install-floogen:
 	@which $(FLOOGEN) > /dev/null || (echo "Installing floogen..." && pip install .)
 
-pkg-sources: check-floogen $(FLOOGEN_PKG_SRC)
-$(FLOOGEN_PKG_OUT_DIR)/floo_%_pkg.sv: $(FLOOGEN_CFG_DIR)/%_pkg.yml $(FLOOGEN_TPL)
-	$(FLOOGEN) -c $< --only-pkg --pkg-outdir $(FLOOGEN_PKG_OUT_DIR) $(FLOOGEN_ARGS)
-
 sources: check-floogen
-	$(FLOOGEN) -c $(FLOOGEN_CFG) -o $(FLOOGEN_OUT_DIR) --pkg-outdir $(FLOOGEN_PKG_OUT_DIR) $(FLOOGEN_ARGS)
+	$(FLOOGEN) -c $(FLOOGEN_CFG) -o $(FLOOGEN_OUT_DIR) $(FLOOGEN_ARGS)
 
 clean-sources:
 	rm -rf $(FLOOGEN_OUT_DIR)