Integration of FractalSync Workloads

CMakeLists.txt

@@ -42,7 +42,7 @@ project(magia-sdk LANGUAGES C ASM)
 
 set(ABI ilp32)
 if (TARGET_PLATFORM STREQUAL "magia_v1")
-    set(ISA rv32imafc)
+    set(ISA rv32imac)
 elseif (TARGET_PLATFORM STREQUAL "magia_v2")
     set(ISA rv32imcxgap9)
 endif ()

Makefile

@@ -37,7 +37,7 @@ fsync_mode		?= stall
 mesh_dv			?= 1
 fast_sim		?= 0
 eval			?= 0
-stalling		?= 0
+stalling		?= 1
 fsync_mm		?= 1
 idma_mm			?= 1
 redmule_mm		?= 1
@@ -46,9 +46,11 @@ profile_cmi		?= 0
 profile_cmo		?= 0
 profile_snc		?= 0
 
-target_platform ?= magia_v2
+# target_platform ?= magia_v2
+target_platform ?= magia_v1
 compiler 		?= GCC_PULP
-ISA				?= rv32imcxgap9
+# ISA				?= rv32imcxgap9
+ISA				?= rv32imac
 gui 			?= 0
 tiles 			?= 2
 spatz			?= 1

targets/magia_v1/include/addr_map/tile_addr_map.h

@@ -39,12 +39,14 @@
 #define FSYNC_END      (0x000006FF)
 #define EU_BASE        (0x00000700)
 #define EU_END         (0x000016FF)
-#define RESERVED_START (0x00001700)   
+// #define SPATZ_CTRL_BASE (0x00001700)
+// #define SPATZ_CTRL_END  (0x000017FF)
+#define RESERVED_START (0x00001800)   
 #define RESERVED_END   (0x0000FFFF)   
 #define STACK_START    (0x00010000)
 #define STACK_END      (0x0001FFFF)
 #define L1_BASE        (0x00020000)
-#define L1_SIZE        (0x000DFFFF)
+#define L1_SIZE        (0x000E0000)
 #define L1_TILE_OFFSET (0x00100000)
 #define L2_BASE        (0xCC000000)
 #define TEST_END_ADDR  (0xCCFF0000)
@@ -62,7 +64,7 @@
 
 #define STR_OFFSET  (0x00000000)
 #define STR_BASE    (RESERVED_START + STR_OFFSET)
-#define SYNC_OFFSET (0x0000F000)
+#define SYNC_OFFSET (0x0000D800)
 #define SYNC_BASE   (RESERVED_START + SYNC_OFFSET)
 #define SYNC_EN     (SYNC_BASE + 0x4)
 

targets/magia_v1/include/tile.h

@@ -22,5 +22,7 @@
 #include "utils/performance_utils.h"
 #include "utils/amo_utils.h"
 #include "utils/eu_isa_utils.h"
+#include "utils/nsync_utils.h"
+
 
 #endif //_TILE_INCLUDE_GUARD_

targets/magia_v1/include/utils/amo_utils.h

@@ -32,20 +32,8 @@ typedef struct node {
 /**
  * Atomically increase the value stored in addr by an immediate value
  */
-int amo_add_immediate(uint32_t addr, uint32_t immediate){
-    asm volatile("addi t0, %0, 0" ::"r"(addr));
-    asm volatile("mv t1, %0" ::"r"(immediate));
-    asm volatile("amoadd.w t2, t1, (t0)" ::);
-    return 0;
-}
-
-/**
- * Atomically increase the value in addr by 1
- */
-inline void amo_increment(volatile uint32_t addr){
-    asm volatile("addi t0, %0, 0" ::"r"(addr));
-    asm volatile("li t1, 1" ::);
-    asm volatile("amoadd.w t2, t1, (t0)" ::);
+static inline void amo_add_imm(volatile uint32_t addr, volatile uint32_t imm){
+    asm volatile("amoadd.w x0, %1, (%0)" ::"r"(addr), "r"(imm):"memory");
 }
 
 /**