Merge branch 'ae' into ae-volta

kernels/sgemm_tcore/kernel.cpp

@@ -95,8 +95,6 @@ void kernel_body(int task_id, kernel_arg_t *__UNIFORM__ arg) {
   constexpr uint32_t quartile = (128 << 10) >> 2; // 128KB / 4
   static_assert((quartile * 4) == SMEM_SIZE, "wrong quartile constant");
 
-  MARK_BEG();
-
   constexpr uint32_t smem_a_offset = 0;
   constexpr uint32_t smem_a_dbuf_offset = 1 * quartile;
   constexpr uint32_t smem_b_offset =
@@ -121,8 +119,6 @@ void kernel_body(int task_id, kernel_arg_t *__UNIFORM__ arg) {
                       threadblocks_per_cluster, threadblock_id_in_cluster,
                       sharedmem_per_threadblock);
 
-  MARK_END();
-
   float *gmem_tmp_d0 = reinterpret_cast<float *>(0xd0000000UL);
   float *gmem_tmp_d1 = reinterpret_cast<float *>(0xd1000000UL);
   float *gmem_tmp_d2 = reinterpret_cast<float *>(0xd2000000UL);

kernels/sgemm_tcore/sgemm_impl.hpp

@@ -6,7 +6,7 @@
 #include "include/gemmini.h"
 #include "gemmini_mmio.h"
 
-#define FP_SIZE 32
+#define FP_SIZE 16
 
 // "fake" fp16 type that only has the correct data width.
 using float16_t = uint16_t;
@@ -110,7 +110,7 @@ static_assert(WMITER * WNITER * TCM * TCN * NUM_WARPS * CORES_PER_CLUSTER ==
 // result matrix will be stored in a swizzled form in the global memory.
 #define WMMA_STORE_FAST 0
 
-#define GEMMINI_DMA 1
+#define GEMMINI_DMA 0
 #define GEMMINI_DMA_FAST 1
 #if SMEM_SIZE == 0x4000
 #define SMEM_ADDR_Q0 ((float * const) 0xff000000)

lib/gemmini/include/gemmini_params.h

@@ -1 +1 @@
-gemmini_params.dim8fp32.h
+gemmini_params.dim16fp16.h

lib/include/VX_config.h

@@ -84,7 +84,7 @@
 #endif
 
 #ifndef NUM_CORES
-#define NUM_CORES 4
+#define NUM_CORES 8
 #endif
 
 #ifndef NUM_WARPS

lib/include/gemmini_mmio.h

@@ -12,9 +12,9 @@
 // 64KB
 // #define SMEM_SIZE 0x10000
 // 128KB (FP16 GEMM)
-// #define SMEM_SIZE 0x20000
+#define SMEM_SIZE 0x20000
 // 256KB (FlashAttention)
-#define SMEM_SIZE 0x40000
+// #define SMEM_SIZE 0x40000
 
 #define SMEM_MASK (SMEM_SIZE - 1)
 #define SMEM_ADDR_END (SMEM_BASE + SMEM_SIZE)

lib/include/vx_spawn.h

@@ -18,7 +18,7 @@
 #include <stdio.h>
 
 #ifndef CORES_PER_CLUSTER
-#define CORES_PER_CLUSTER 4
+#define CORES_PER_CLUSTER 8
 #endif
 
 #ifdef __cplusplus