Merge pull request #6 from pulp-platform/michaero/synth_ci

Add internal CI

.github/workflows/gitlab-ci.yml

@@ -0,0 +1,29 @@
+# Copyright 2022 ETH Zurich and University of Bologna.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
+# Author: Alessandro Ottaviano <[email protected]>
+
+name: gitlab-ci
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  gitlab-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Gitlab CI
+        uses: pulp-platform/pulp-actions/gitlab-ci@v2
+        if: >
+          github.repository == 'pulp-platform/memory_island' &&
+          (github.event_name != 'pull_request' ||
+          github.event.pull_request.head.repo.full_name == github.repository)
+        with:
+          domain: iis-git.ee.ethz.ch
+          repo: github-mirror/memory_island
+          token: ${{ secrets.GITLAB_TOKEN }}

.gitignore

@@ -8,3 +8,7 @@ work/
 transcript
 vsim.wlf
 vsim_stacktrace*
+
+# Internal CI
+/nonfree/
+/spyglass/

.gitlab-ci.yml

@@ -0,0 +1,26 @@
+# Copyright 2023 ETH Zurich and University of Bologna.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Paul Scheffler <[email protected]>
+# Alessandro Ottaviano <[email protected]>
+
+# We initialize the nonfree repo, then spawn a sub-pipeline from it
+
+stages:
+  - nonfree
+
+init:
+  stage: nonfree
+  script: make nonfree-init
+  artifacts:
+    paths: [ nonfree/gitlab-ci.yml ]
+
+subpipe:
+  stage: nonfree
+  needs: [ init ]
+  trigger:
+    include:
+      - artifact: nonfree/gitlab-ci.yml
+        job: init
+    strategy: depend

Bender.yml

@@ -28,3 +28,7 @@ sources:
   - target: test
     files:
       - test/axi_memory_island_tb.sv
+
+  - target: memory_island_standalone_synth
+    files:
+      - test/synth/axi_memory_island_synth.sv

Makefile

@@ -4,7 +4,9 @@
 
 # Michael Rogenmoser <[email protected]>
 
-BENDER ?= bender -d $(CURDIR)
+MEMORY_ISLAND_ROOT := $(CURDIR)
+
+BENDER ?= bender -d $(MEMORY_ISLAND_ROOT)
 
 VSIM ?= vsim
 
@@ -16,3 +18,17 @@ scripts/compile.tcl: Bender.yml Bender.lock
 test-vsim: scripts/compile.tcl
 	$(VSIM) -64 -c -do "quit -code [source scripts/compile.tcl]"
 	$(VSIM) -64 -do "vsim axi_memory_island_tb -voptargs=+acc; do scripts/debug_wave.do"
+
+test-vsim-bare: scripts/compile.tcl
+	$(VSIM) -64 -c -do "quit -code [source scripts/compile.tcl]"
+	$(VSIM) -64 -c -do "vsim axi_memory_island_tb; run -all"
+
+## Internal CI
+NONFREE_REMOTE ?= [email protected]:pulp-restricted/memory_island_nonfree.git
+NONFREE_COMMIT ?= master
+
+nonfree-init:
+	git clone $(NONFREE_REMOTE) $(MEMORY_ISLAND_ROOT)/nonfree
+	cd nonfree && git checkout $(NONFREE_COMMIT)
+
+-include $(MEMORY_ISLAND_ROOT)/nonfree/nonfree.mk

src/axi_memory_island_wrap.sv

@@ -48,7 +48,7 @@ module axi_memory_island_wrap #(
   parameter int unsigned SpillRspBank         = 0,
 
   /// Relinquish narrow priority after x cycles, 0 for never. Requires SpillNarrowReqRouted==0.
-  parameter int unsigned WidePriorityWait     = 0,
+  parameter int unsigned WidePriorityWait     = 1,
 
   /// Banking Factor for the Wide Ports (power of 2)
   parameter int unsigned NumWideBanks         = (1<<$clog2(NumWideReq))*2*2,

test/axi_memory_island_tb.sv

@@ -696,7 +696,7 @@ module axi_memory_island_tb #(
       errors += $countones(mismatch);
       if (end_of_sim == '1) begin
         $display("Counted %d errors.", errors);
-        $stop();
+        $finish(errors);
       end
       @(posedge clk);
     end while (1'b1);