Ci flwadd

.gitlab-ci.yml

@@ -5,7 +5,9 @@ variables:
 stages:
   - checkout
   - build
-  - test
+  - test_1x1
+  - test_1x1_hbm2
+  - test_4x4
 
 build-repos:
   stage: checkout
@@ -19,6 +21,7 @@ build-repos:
     - git clone --recursive -b $CI_COMMIT_REF_NAME https://github.com/bespoke-silicon-group/bsg_manycore.git
     - echo "pwd"
     - echo $CI_PROJECT_DIR
+    - echo $CI_COMMIT_REF_NAME
     - >
       if [ -e cache/ ]; then
         echo "Pulling toolchain installation from cache...";
@@ -100,7 +103,7 @@ build-toolchain:
   retry: 2
 
 test-spmd:
-  stage: test
+  stage: test_1x1
   tags:
     - bsg
     - vcs
@@ -125,7 +128,7 @@ test-spmd:
 
 
 test-beebs:
-  stage: test
+  stage: test_1x1
   tags:
     - bsg
     - vcs
@@ -147,3 +150,138 @@ test-beebs:
       - /^ci_.*$/
       - master
   retry: 2
+
+
+test-interrupt:
+  stage: test_1x1
+  tags:
+    - bsg
+    - vcs
+  script:
+    - echo "Running interrupt regression..."
+    - cd bsg_manycore
+    - pwd
+    - ./ci/interrupt.sh
+  cache:
+    key: $CI_COMMIT_REF_NAME
+    paths:
+      - $CI_PROJECT_DIR/bsg_cadenv
+      - $CI_PROJECT_DIR/basejump_stl
+      - $CI_PROJECT_DIR/bsg_manycore
+      - $CI_PROJECT_DIR/bsg_bladerunner
+    policy: pull
+  only:
+    refs:
+      - /^ci_.*$/
+      - master
+  retry: 2
+
+
+
+test-spmd-hbm2:
+  stage: test_1x1_hbm2
+  tags:
+    - bsg
+    - vcs
+  script:
+    - export BSG_MACHINE_PATH=$CI_PROJECT_DIR/bsg_manycore/machines/pod_1x1_hbm2
+    - echo "Running Manycore regression..."
+    - cd bsg_manycore
+    - pwd
+    - ./ci/spmd.sh
+  cache:
+    key: $CI_COMMIT_REF_NAME
+    paths:
+      - $CI_PROJECT_DIR/bsg_cadenv
+      - $CI_PROJECT_DIR/basejump_stl
+      - $CI_PROJECT_DIR/bsg_manycore
+      - $CI_PROJECT_DIR/bsg_bladerunner
+    policy: pull
+  only:
+    refs:
+      - /^ci_.*$/
+      - master
+  retry: 2
+
+
+test-interrupt-hbm2:
+  stage: test_1x1_hbm2
+  tags:
+    - bsg
+    - vcs
+  script:
+    - export BSG_MACHINE_PATH=$CI_PROJECT_DIR/bsg_manycore/machines/pod_1x1_hbm2
+    - echo "Running interrupt regression..."
+    - cd bsg_manycore
+    - pwd
+    - ./ci/interrupt.sh
+  cache:
+    key: $CI_COMMIT_REF_NAME
+    paths:
+      - $CI_PROJECT_DIR/bsg_cadenv
+      - $CI_PROJECT_DIR/basejump_stl
+      - $CI_PROJECT_DIR/bsg_manycore
+      - $CI_PROJECT_DIR/bsg_bladerunner
+    policy: pull
+  only:
+    refs:
+      - /^ci_.*$/
+      - master
+  retry: 2
+
+
+
+
+
+
+
+test-spmd-4x4:
+  stage: test_4x4
+  tags:
+    - bsg
+    - vcs
+  script:
+    - export BSG_MACHINE_PATH=$CI_PROJECT_DIR/bsg_manycore/machines/pod_4x4
+    - echo "Running Manycore regression..."
+    - cd bsg_manycore
+    - pwd
+    - ./ci/spmd.sh
+  cache:
+    key: $CI_COMMIT_REF_NAME
+    paths:
+      - $CI_PROJECT_DIR/bsg_cadenv
+      - $CI_PROJECT_DIR/basejump_stl
+      - $CI_PROJECT_DIR/bsg_manycore
+      - $CI_PROJECT_DIR/bsg_bladerunner
+    policy: pull
+  only:
+    refs:
+      - /^ci_.*$/
+      - master
+  retry: 2
+
+
+test-interrupt-4x4:
+  stage: test_4x4
+  tags:
+    - bsg
+    - vcs
+  script:
+    - export BSG_MACHINE_PATH=$CI_PROJECT_DIR/bsg_manycore/machines/pod_4x4
+    - echo "Running interrupt regression..."
+    - cd bsg_manycore
+    - pwd
+    - ./ci/interrupt.sh
+  cache:
+    key: $CI_COMMIT_REF_NAME
+    paths:
+      - $CI_PROJECT_DIR/bsg_cadenv
+      - $CI_PROJECT_DIR/basejump_stl
+      - $CI_PROJECT_DIR/bsg_manycore
+      - $CI_PROJECT_DIR/bsg_bladerunner
+    policy: pull
+  only:
+    refs:
+      - /^ci_.*$/
+      - master
+  retry: 2

Makefile

@@ -1,4 +1,5 @@
 .DEFAULT_GOAL = nothing
+.PHONY: machines
 
 nothing:
 
@@ -8,8 +9,12 @@ checkout_submodules:
 	git submodule update --init --recursive
 
 machines:
-	make -C machines/
+	make -j 3 -C machines/
 
 tools:
 	make -C software/riscv-tools checkout-all
 	make -C software/riscv-tools build-all
+
+# helpful grep rule that allows you to skip large compiled riscv-tools and imports directories
+%.grep:
+	grep -r "$*" --exclude-dir=imports --exclude-dir=riscv-tools

README.md

@@ -4,11 +4,11 @@ This repo contains the **bsg\_manycore** source code with contributions from the
 
 The tile based architecture is designed for computing efficiency, scalability and generality. The two main components are:
 
-* **Computing Node:** Purpose-designed RISC-V 32IM compatible core runs at 1.4GHz@16nm, but nodes also can be any other accelerators.
+* **Computing Node:** Purpose-designed RISC-V 32IMF compatible core runs at 1.4GHz@16nm, but nodes also can be any other accelerators.
 * **Mesh Network  :** Dimension ordered, single flit network with inter-nodes synchronization primitives (mutex, barrier etc.)
 
-Without any customized circuit, a 16nm prototype chip that holds 16x31 tiles on a 4.5x3.4 mm^2 die space achieves **812,350**
-aggregated [CoreMark](https://www.eembc.org/coremark/) score.
+Without any custom circuits, a 16nm prototype chip with 16x31 tiles on a 4.5x3.4 mm^2 die space achieves **812,350**
+aggregated [CoreMark](https://www.eembc.org/coremark/) score, a world record. Many improvements have been made since this previous version.
 
 # Documentation 
 
@@ -24,12 +24,18 @@ aggregated [CoreMark](https://www.eembc.org/coremark/) score.
 
 # Initial Setup for running programs
 
+Above this directory:
+
+- Checkout `basejump_stl`; cd into imports directory and type `make DRAMSim3`
+- Checkout `bsg_cadenv`
+
 In this directory:
 
 - `make checkout_submodules`: To update all submodules in `imports/`.
-- `make tools`: To install software toolchain required running programs on BSG Manycore.
+- `make tools`: To install software toolchain required running programs on BSG Manycore. (This build uses 12-16 threads by default.)
 - `make machines`: Compile simulation executables in `machines/`.
 - Edit `BSG_MACHINE_PATH` in `software/mk/Makefile.paths` to choose the machine to run somd programs on.
+- go into `software/spmd/bsg_barrier` and type `make` to run a test!
 
 # Contributions
 

ci/beebs.sh

@@ -3,5 +3,5 @@
 cd software/spmd/beebs
 
 make clean
-make -j 6 > /dev/null 2>&1
+make -j 8 > /dev/null 2>&1
 make check_finish

ci/interrupt.sh

@@ -0,0 +1,7 @@
+#~/bin/bash
+
+cd software/spmd/interrupt_tests
+
+make clean
+make regress > /dev/null 2>&1
+make summary

machines/.gitignore

@@ -1,8 +1,15 @@
 simv-debug
 simv-debug.daidir
+simv-profile
+simv-profile.daidir
+simv-debug
 vc_hdrs.h
 stack.info.*
+*/build-profile
 */build-debug
 */build
 */csrc
 */csrc-debug
+*/csrc-profile
+*/*.tr
+*/bsg_tag_boot_rom.v