hps: test without master SPI

.github/workflows/oxide.yml

@@ -19,4 +19,5 @@ jobs:
       - run: pwd && source env/conda/bin/activate cfu-common && source environment && ulimit -S -t 900 && ulimit -H -t 900 && cd proj/hps_accel && pip3 list && make PLATFORM=hps EXTRA_LITEX_ARGS="--cpu-variant=slimopt+cfu" clean bitstream || true
       - run: pwd && source env/conda/bin/activate cfu-common && source environment && ulimit -S -t 900 && ulimit -H -t 900 && cd proj/hps_accel && make PLATFORM=hps EXTRA_NEXTPNR_ARGS="--placer-heap-timingweight 52" EXTRA_LITEX_ARGS="--separate-arena --cpu-variant=slimopt+cfu --extra-nextpnr-params" clean bitstream || true
       - run: pwd && source env/conda/bin/activate cfu-common && source environment && ulimit -S -t 240 && ulimit -H -t 240 && cd proj/hps_accel && make PLATFORM=hps EXTRA_NEXTPNR_ARGS="--placer-heap-timingweight 52" EXTRA_LITEX_ARGS="--separate-arena --cpu-variant=slimopt+cfu --extra-nextpnr-params --no-compile-software" clean bitstream || true
+      - run: pwd && source env/conda/bin/activate cfu-common && source environment && ulimit -S -t 600 && ulimit -H -t 600 && cd proj/hps_accel && make PARALLEL=yes clean bitstream software -j2 || true
       - run: pwd && source env/conda/bin/activate cfu-common && source environment && cd proj/mport && pip3 list && make PLATFORM=hps bitstream software

common/src/models/hps_model/hps_model.cc

@@ -22,33 +22,51 @@
 #include "models/hps_model/hps_model_2021_09_20_tiled.h"
 #include "models/hps_model/hps_model_2022_01_05_74ops.h"
 #include "models/hps_model/hps_model_2022_01_05_89ops.h"
+#include "models/hps_model/presence_0_320_240_1_20220117_140437_201k_26k_96ops.h"
+#include "models/hps_model/second_0_320_240_1_20220117_135512_201k_26k_96ops.h"
 #include "tflite.h"
 
 namespace {
 
 int loaded_model = 0;
 
-// Initialize models
+// Initialize model
 void do_init_09_20(void) {
   puts("Loading HPS 09_20 model");
   tflite_load_model(hps_model_2021_09_20_tiled, hps_model_2021_09_20_tiled_len);
   loaded_model = 0;
 }
 
-// Initialize models
+// Initialize model
 void do_init_01_05_74ops(void) {
   puts("Loading HPS 01_05_74ops model");
   tflite_load_model(hps_model_2022_01_05_74ops, hps_model_2022_01_05_74ops_len);
   loaded_model = 1;
 }
 
-// Initialize models
+// Initialize model
 void do_init_01_05_89ops(void) {
   puts("Loading HPS 01_05_89ops model");
   tflite_load_model(hps_model_2022_01_05_89ops, hps_model_2022_01_05_89ops_len);
   loaded_model = 2;
 }
 
+// Initialize model
+void do_init_presence_2022017_96ops(void) {
+  puts("Loading Presence 20220117 96ops model");
+  tflite_load_model(presence_0_320_240_1_20220117_140437_201k_26k_96ops,
+                    presence_0_320_240_1_20220117_140437_201k_26k_96ops_len);
+  loaded_model = 3;
+}
+
+// Initialize model
+void do_init_second_2022017_96ops(void) {
+  puts("Loading Second 20220117 96ops model");
+  tflite_load_model(second_0_320_240_1_20220117_135512_201k_26k_96ops,
+                    second_0_320_240_1_20220117_135512_201k_26k_96ops_len);
+  loaded_model = 4;
+}
+
 // Run classification and interpret results
 int32_t classify() {
   tflite_classify();
@@ -84,13 +102,13 @@ void do_classify_zeros() { printf("Result is %ld\n", classify_zeros()); }
 struct GoldenTest {
   int32_t (*fn)();
   const char* name;
-  int32_t expected[3];
+  int32_t expected[5];
 };
 
 GoldenTest golden_tests[4] = {
-    {classify_cat, "cat", {-77, -47, -47}},
-    {classify_diagram, "diagram", {-124, -123, -123}},
-    {classify_zeros, "zeroes", {-126, -128, -128}},
+    {classify_cat, "cat", {-77, -47, -47, -101, -117}},
+    {classify_diagram, "diagram", {-124, -123, -123, -124, -127}},
+    {classify_zeros, "zeroes", {-126, -128, -128, -128, -128}},
     {nullptr, "", 0},
 };
 
@@ -130,6 +148,10 @@ struct Menu MENU = {
                   do_init_01_05_74ops),
         MENU_ITEM('2', "Reinitialize with 01_05_89ops model",
                   do_init_01_05_89ops),
+        MENU_ITEM('3', "Reinitialize with presence_2022017_96ops model",
+                  do_init_presence_2022017_96ops),
+        MENU_ITEM('4', "Reinitialize with second_2022017_96ops model",
+                  do_init_second_2022017_96ops),
         MENU_END,
     },
 };

proj/hps_accel/Makefile

@@ -75,13 +75,19 @@ DEFINES += INCLUDE_MODEL_HPS
 # Use PLATFORM=common_soc TARGET=digilent_arty to select Arty instead of hps
 PLATFORM=hps
 
+# Parallel software and bitstream build
+PARALLEL ?= no
+
 # How to respond to run and test
 RUN_MENU_ITEMS=1 1 c
 TEST_MENU_ITEMS=3 q
 
 # Customise arguments to Litex:
 export EXTRA_LITEX_ARGS
-EXTRA_LITEX_ARGS += --cpu-variant slim+cfu
+export EXTRA_NEXTPNR_ARGS
+
+# Use slim optimized core + CFU
+EXTRA_LITEX_ARGS += --cpu-variant slimopt+cfu
 
 # gen2 needs special build args and only works on hps
 ifeq '$(GATEWARE_GEN)' '2'
@@ -98,12 +104,19 @@ ifeq '$(TARGET)' 'digilent_arty'
 EXTRA_LITEX_ARGS += --sys-clk-freq 75000000
 endif
 
+ifneq '$(PARALLEL)' 'no'
+EXTRA_LITEX_ARGS += --extra-nextpnr-params
+EXTRA_NEXTPNR_ARGS += --placer-heap-timingweight 52
+endif
+
 # Add constants defined in gateware/constants.py to C++ build
 BUILD_DIR_EXTRA_DEP = $(BUILD_DIR)/src/gateware_constants.h
 
 # Pass gen argument to cfu_gen
 CFU_GEN_EXTRA_ARGS = gen$(GATEWARE_GEN)
 
+BUILD_FLAGS="-j$(shell nproc)"
+
 #### Base rules ####
 include ../proj.mk
 
@@ -112,3 +125,5 @@ include ../proj.mk
 # Rule to build gateware_constants.h
 $(BUILD_DIR)/src/gateware_constants.h: $(BUILD_DIR)/src $(PROJ_DIR)/gateware/gen$(GATEWARE_GEN)/constants.py
 	$(PYRUN) -m gateware.gen$(GATEWARE_GEN).constants $@
+
+all: bitstream software

proj/hps_accel/gateware/gen2/hps_cfu.py

@@ -132,10 +132,6 @@ def elab(self, m):
         m.d.sync += self.filter_output.valid.eq(0)
         m.d.sync += self.post_process_params.valid.eq(0)
 
-        # post process parameters
-        pp_bias = Signal(signed(16))
-        pp_shift = Signal(unsigned(4))
-
         # All sets take exactly one cycle
         m.d.sync += self.done.eq(0)
 
@@ -182,13 +178,13 @@ def elab(self, m):
                 with m.Case(Constants.REG_NUM_OUTPUT_VALUES):
                     m.d.sync += self.config.num_output_values.eq(self.in0)
                 with m.Case(Constants.REG_POST_PROCESS_BIAS):
-                    m.d.sync += pp_bias.eq(self.in0s)
+                    m.d.sync += self.post_process_params.payload.bias.eq(
+                        self.in0s)
                 with m.Case(Constants.REG_POST_PROCESS_SHIFT):
-                    m.d.sync += pp_shift.eq(self.in0)
+                    m.d.sync += self.post_process_params.payload.shift.eq(
+                        self.in0)
                 with m.Case(Constants.REG_POST_PROCESS_MULTIPLIER):
                     m.d.sync += [
-                        self.post_process_params.payload.bias.eq(pp_bias),
-                        self.post_process_params.payload.shift.eq(pp_shift),
                         self.post_process_params.payload.multiplier.eq(
                             self.in0s),
                         self.post_process_params.valid.eq(1),
@@ -220,7 +216,7 @@ def max_(word0, word1):
         m.d.sync += self.done.eq(0)
         with m.If(self.start):
             this2 = Signal(32)
-            m.d.comb += this2.eq(max_(self.in0,self.in1))
+            m.d.comb += this2.eq(max_(self.in0, self.in1))
             m.d.sync += self.output.eq(max_(this2, last2))
             m.d.sync += last2.eq(this2)
             m.d.sync += self.done.eq(1)

proj/hps_accel/gateware/gen2/post_process.py

@@ -195,7 +195,7 @@ def delay(m, signal, cycles):
 
 
 POST_PROCESS_PARAMS = [
-    ('bias', signed(16)),
+    ('bias', signed(18)),
     ('multiplier', signed(32)),
     ('shift', unsigned(4)),
 ]