sw: Use custom CSR names

Author: colluca

iis-setup.sh

@@ -10,7 +10,7 @@ export SN_BENDER=bender-0.28.1
 export SN_VCS_SEPP=vcs-2024.09
 export SN_VERILATOR_SEPP="oseda -2025.03"
 export SN_QUESTA_SEPP=questa-2023.4
-export SN_LLVM_BINROOT=/usr/scratch2/vulcano/colluca/tools/riscv32-snitch-llvm-almalinux8-15.0.0-snitch-0.2.0/bin
+export SN_LLVM_BINROOT=/usr/scratch2/vulcano/colluca/tools/riscv32-snitch-llvm-almalinux8-15.0.0-snitch-0.3.0/bin
 
 # Create Python virtual environment with required packages
 /usr/local/anaconda3-2023.07/bin/python -m venv .venv

sw/runtime/src/ssr.h

@@ -96,7 +96,7 @@ inline void snrt_ssr_enable() {
 #ifdef __TOOLCHAIN_LLVM__
     __builtin_ssr_enable();
 #else
-    asm volatile("csrsi 0x7C0, 1\n");
+    asm volatile("csrsi ssr, 1\n");
 #endif
 }
 
@@ -107,7 +107,7 @@ inline void snrt_ssr_disable() {
 #ifdef __TOOLCHAIN_LLVM__
     __builtin_ssr_disable();
 #else
-    asm volatile("csrci 0x7C0, 1\n");
+    asm volatile("csrci ssr, 1\n");
 #endif
 }
 
@@ -117,14 +117,14 @@ inline void snrt_ssr_disable() {
  *             chaining.
  */
 inline void snrt_sc_enable(uint32_t mask) {
-    asm volatile("csrs 0x7C3, %[mask]\n" : : [ mask ] "r"(mask) :);
+    asm volatile("csrs sc, %[mask]\n" : : [ mask ] "r"(mask) :);
 }
 
 /**
  * @brief Disable scalar chaining.
  */
 inline void snrt_sc_disable(uint32_t mask) {
-    asm volatile("csrc 0x7C3, %[mask]\n" : : [ mask ] "r"(mask) :);
+    asm volatile("csrc sc, %[mask]\n" : : [ mask ] "r"(mask) :);
 }
 
 /**

sw/runtime/src/sync.h

@@ -175,7 +175,7 @@ inline void snrt_wake_clusters(uint32_t core_mask, snrt_comm_t comm = NULL) {
  *       this function, or the calling cores will stall indefinitely.
  */
 inline void snrt_cluster_hw_barrier() {
-    asm volatile("csrr x0, 0x7C2" ::: "memory");
+    asm volatile("csrr x0, barrier" ::: "memory");
 }
 
 /**
@@ -414,10 +414,8 @@ inline void snrt_wait_writeback(uint32_t val) {
  * @param field Defines the AW user field for the AXI transfer
  */
 inline void snrt_set_awuser(uint64_t field) {
-    uint32_t user_low = (uint32_t)(field);
-    uint32_t user_high = (uint32_t)(field >> 32);
-    write_csr(0x7c4, user_low);
-    write_csr(0x7c5, user_high);
+    write_csr(user_low, (uint32_t)(field));
+    write_csr(user_high, (uint32_t)(field >> 32));
 }
 
 //================================================================================

util/container/Dockerfile

@@ -18,7 +18,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 FROM ubuntu:${UBUNTU_VERSION} AS tool-builder
 ARG BENDER_VERSION=0.28.1
 ARG DOXYGEN_VERSION=1.12.0
-ARG SNITCH_LLVM_VERSION=15.0.0-snitch-0.2.0
+ARG SNITCH_LLVM_VERSION=15.0.0-snitch-0.3.0
 ARG UBUNTU_VERSION
 ARG DEBIAN_FRONTEND