Merge branch accelerator-project:main into main

.gitignore

@@ -4,6 +4,7 @@
 simulate/sim/*
 lint/*
 .socinit
+.dma350_configured
 accelerator/html/*
 wrapper/html/*
 system/src/bootrom/*

.gitlab-ci.yml

@@ -48,7 +48,7 @@ simulate-hello:
   script:
     - echo "Simulation phase started"
     - source set_env.sh
-    - socsim test_aes128 TESTNAME=hello
+    - socsim test_nanosoc TESTNAME=hello
   tags:
     - VLAB-ZCU
     

asic_lib_tech @ 39deacc6

+Subproject commit 39deacc600317d7c68df33421c1e49521818f69f

env/dependency_env.sh

@@ -31,6 +31,7 @@ export SOCLABS_SLCOREM0_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/nanosoc/slco
 
 # SLDMA-230
 export SOCLABS_SLDMA230_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/nanosoc/sldma230_tech"
+export SOCLABS_SLDMA350_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/nanosoc/sldma350_tech"
 
 # Primtives
 export SOCLABS_PRIMITIVES_TECH_DIR="$SOCLABS_PROJECT_DIR/rtl_primitives_tech"

nanosoc_tech @ 1e23e6d5

-Subproject commit 244a49f4e1c7465d72e4f26d2faf7f4f8311b94f
+Subproject commit 1e23e6d5295a5ec8f597c5f4fac346d66fc2d426

projbranch

@@ -19,3 +19,4 @@ fpga_lib_tech: main
 generic_lib_tech: main
 rtl_primitives_tech: main
 soctools_flow: main
+asic_lib_tech: main

set_env.sh

@@ -12,3 +12,7 @@
 
 # Source set_env script from soctools_flow
 source soctools_flow/bin/project_setup.sh $@
+if [ ! -f .dma350_configured ]; then
+    make -C nanosoc_tech/nanosoc/sldma350_tech/ config_dma_ahb
+    touch .dma350_configured
+fi
\ No newline at end of file

soctools_flow @ eb193b3a

-Subproject commit 7e49a11b40b02c7879275a95c0b174cffa5f413d
+Subproject commit eb193b3aa83a65cf3a510a171ea919bfa84cc348

system/src/accelerator_subsystem.v

@@ -9,6 +9,7 @@
 //
 // Copyright (C) 2023; SoC Labs (www.soclabs.org)
 //-----------------------------------------------------------------------------
+`include "gen_defines.v"
 
 module accelerator_subsystem #(
   parameter SYS_ADDR_W = 32,
@@ -36,7 +37,35 @@ module accelerator_subsystem #(
   // Data Request Signal to DMAC
   output wire   [1:0]              EXP_DRQ,
   input  wire   [1:0]              EXP_DLAST,
-  
+   // DMAC Stream interfaces
+`ifdef DMAC_1_DMA350
+  input  wire                      EXP_STR_IN_0_TVALID,
+  output wire                      EXP_STR_IN_0_TREADY,
+  input  wire [SYS_DATA_W-1:0]     EXP_STR_IN_0_TDATA,
+  input  wire [15:0]               EXP_STR_IN_0_TSTRB,
+  input  wire                      EXP_STR_IN_0_TLAST,
+
+  output wire                      EXP_STR_OUT_0_TVALID,
+  input  wire                      EXP_STR_OUT_0_TREADY,
+  output wire [SYS_DATA_W-1:0]     EXP_STR_OUT_0_TDATA,
+  output wire [15:0]               EXP_STR_OUT_0_TSTRB,
+  output wire                      EXP_STR_OUT_0_TLAST,
+  input  wire                      EXP_STR_OUT_0_FLUSH,
+
+  input  wire                      EXP_STR_IN_1_TVALID,
+  output wire                      EXP_STR_IN_1_TREADY,
+  input  wire [SYS_DATA_W-1:0]     EXP_STR_IN_1_TDATA,
+  input  wire [15:0]               EXP_STR_IN_1_TSTRB,
+  input  wire                      EXP_STR_IN_1_TLAST,
+
+  output wire                      EXP_STR_OUT_1_TVALID,
+  input  wire                      EXP_STR_OUT_1_TREADY,
+  output wire [SYS_DATA_W-1:0]     EXP_STR_OUT_1_TDATA,
+  output wire [15:0]               EXP_STR_OUT_1_TSTRB,
+  output wire                      EXP_STR_OUT_1_TLAST,
+  input  wire                      EXP_STR_OUT_1_FLUSH,
+`endif 
+
   // Interrupts
   output wire   [IRQ_NUM-1:0]      EXP_IRQ
 );