Skip to content

Commit d7894c0

Browse files
Navaneeth-KunhiPurayilNavaneeth-KunhiPurayil
committed
sw: add unrolled kernels for dp-fdotp and dp-faxpy
1 parent 0cd10da commit d7894c0

File tree

7 files changed

+143
-1
lines changed

7 files changed

+143
-1
lines changed

‎sw/spatzBenchmarks/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ include_directories(${SNRUNTIME_INCLUDE_DIRS})
2424

2525
add_compile_options(-O3 -g -ffunction-sections)
2626

27+
# Use unrolled spatzBenchmarks
28+
if (UNROLL)
29+
add_definitions(-DUNROLL)
30+
endif()
2731

2832
# Macro to regenerate the golden values and compile a module
2933
macro(add_spatz_test_oneParam name file param1)

‎sw/spatzBenchmarks/dp-faxpy/kernel/faxpy.c‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,54 @@ void faxpy_v64b(const double a, const double *x, const double *y,
4545
} while (avl > 0);
4646
}
4747

48+
// Unrolled 64-bit AXPY: y = a * x + y
49+
void faxpy_v64b_unrl(const double a, const double *x, const double *y,
50+
unsigned int avl) {
51+
unsigned int vl;
52+
double *y2;
53+
54+
// Stripmine and accumulate a partial vector
55+
do {
56+
// Set the vl
57+
asm volatile("vsetvli %0, %1, e64, m8, ta, ma" : "=r"(vl) : "r"(avl));
58+
59+
// Load vectors
60+
asm volatile("vle64.v v0, (%0)" ::"r"(x));
61+
asm volatile("vle64.v v8, (%0)" ::"r"(y));
62+
63+
// Multiply-accumulate
64+
asm volatile("vfmacc.vf v8, %0, v0" ::"f"(a));
65+
avl -= vl;
66+
if (avl > 0) {
67+
// Set the vl
68+
asm volatile("vsetvli %0, %1, e64, m8, ta, ma" : "=r"(vl) : "r"(avl));
69+
70+
// Load vectors
71+
x += vl;
72+
asm volatile("vle64.v v16, (%0)" ::"r"(x));
73+
y2 = y + vl;
74+
asm volatile("vle64.v v24, (%0)" ::"r"(y2));
75+
76+
// Multiply-accumulate
77+
asm volatile("vfmacc.vf v24, %0, v16" ::"f"(a));
78+
}
79+
80+
// Store results
81+
asm volatile("vse64.v v8, (%0)" ::"r"(y));
82+
if (avl > 0) {
83+
// Store results
84+
y += vl;
85+
asm volatile("vse64.v v24, (%0)" ::"r"(y));
86+
avl -= vl;
87+
}
88+
89+
// Bump pointers
90+
x += vl;
91+
y += vl;
92+
93+
} while (avl > 0);
94+
}
95+
4896
// 32-bit AXPY: y = a * x + y
4997
void faxpy_v32b(const float a, const float *x, const float *y,
5098
unsigned int avl) {

‎sw/spatzBenchmarks/dp-faxpy/kernel/faxpy.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
inline void faxpy_v64b(const double a, const double *x, const double *y,
2323
unsigned int avl) __attribute__((always_inline));
24+
inline void faxpy_v64b_unrl(const double a, const double *x, const double *y,
25+
unsigned int avl) __attribute__((always_inline));
2426
inline void faxpy_v32b(const float a, const float *x, const float *y,
2527
unsigned int avl) __attribute__((always_inline));
2628
inline void faxpy_v16b(const _Float16 a, const _Float16 *x, const _Float16 *y,

‎sw/spatzBenchmarks/dp-faxpy/main.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ int main() {
6262

6363
snrt_dma_start_1d(x, axpy_X_dram, dim * sizeof(double));
6464
snrt_dma_start_1d(y, axpy_Y_dram, dim * sizeof(double));
65+
snrt_dma_wait_all();
6566
}
6667

6768
// Wait for all cores to finish
@@ -82,8 +83,12 @@ int main() {
8283
if (cid == 0)
8384
timer = benchmark_get_cycle();
8485

85-
// Call AXPY
86+
// Call AXPY
87+
#ifdef UNROLL
88+
faxpy_v64b_unrl(*a, x_int, y_int, dim_core);
89+
#else
8690
faxpy_v64b(*a, x_int, y_int, dim_core);
91+
#endif
8792

8893
// Wait for all cores to finish
8994
snrt_cluster_hw_barrier();

‎sw/spatzBenchmarks/dp-fdotp/kernel/fdotp.c‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,82 @@ double fdotp_v64b(const double *a, const double *b, unsigned int avl) {
5959
return red;
6060
}
6161

62+
// 64-bit dot-product: a * b
63+
// m8 allows only for partial register re-allocation with factor-2 unrolling
64+
double fdotp_v64b_m8_unrl(const double *a, const double *b, unsigned int avl) {
65+
const unsigned int orig_avl = avl;
66+
unsigned int vl;
67+
68+
double red;
69+
70+
// Stripmine and accumulate a partial reduced vector
71+
do {
72+
// Set the vl
73+
asm volatile("vsetvli %0, %1, e64, m8, ta, ma" : "=r"(vl) : "r"(avl));
74+
75+
// Load chunk a and b
76+
asm volatile("vle64.v v8, (%0)" ::"r"(a));
77+
asm volatile("vle64.v v16, (%0)" ::"r"(b));
78+
79+
// Multiply and accumulate
80+
if (avl == orig_avl) {
81+
asm volatile("vfmul.vv v24, v8, v16");
82+
} else {
83+
asm volatile("vfmacc.vv v24, v8, v16");
84+
}
85+
86+
// Bump pointers
87+
a += vl;
88+
b += vl;
89+
avl -= vl;
90+
91+
if (avl <= 0)
92+
break;
93+
94+
// Set the vl
95+
asm volatile("vsetvli %0, %1, e64, m8, ta, ma" : "=r"(vl) : "r"(avl));
96+
97+
// Load chunk a and b
98+
asm volatile("vle64.v v0, (%0)" ::"r"(a));
99+
asm volatile("vle64.v v8, (%0)" ::"r"(b));
100+
101+
// Multiply and accumulate
102+
asm volatile("vfmacc.vv v24, v0, v8");
103+
104+
// Bump pointers
105+
a += vl;
106+
b += vl;
107+
avl -= vl;
108+
109+
if (avl <= 0)
110+
break;
111+
112+
// Set the vl
113+
asm volatile("vsetvli %0, %1, e64, m8, ta, ma" : "=r"(vl) : "r"(avl));
114+
115+
// Load chunk a and b
116+
asm volatile("vle64.v v16, (%0)" ::"r"(a));
117+
asm volatile("vle64.v v0, (%0)" ::"r"(b));
118+
119+
// Multiply and accumulate
120+
asm volatile("vfmacc.vv v24, v0, v16");
121+
122+
// Bump pointers
123+
a += vl;
124+
b += vl;
125+
avl -= vl;
126+
} while (avl > 0);
127+
128+
// Clean the accumulator
129+
asm volatile("vmv.s.x v0, zero");
130+
131+
// Reduce and return
132+
asm volatile("vfredusum.vs v0, v24, v0");
133+
asm volatile("vfmv.f.s %0, v0" : "=f"(red));
134+
135+
return red;
136+
}
137+
62138
// 32-bit dot-product: a * b
63139
float fdotp_v32b(const float *a, const float *b, unsigned int avl) {
64140
const unsigned int orig_avl = avl;

‎sw/spatzBenchmarks/dp-fdotp/kernel/fdotp.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121

2222
inline double fdotp_v64b(const double *a, const double *b, unsigned int avl)
2323
__attribute__((always_inline));
24+
inline double fdotp_v64b_m8_unrl(const double *a, const double *b,
25+
unsigned int avl)
26+
__attribute__((always_inline));
2427
inline float fdotp_v32b(const float *a, const float *b, unsigned int avl)
2528
__attribute__((always_inline));
2629
inline _Float16 fdotp_v16b(const _Float16 *a, const _Float16 *b,

‎sw/spatzBenchmarks/dp-fdotp/main.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ int main() {
8282

8383
// Calculate dotp
8484
double acc;
85+
#ifdef UNROLL
86+
acc = fdotp_v64b_m8_unrl(a_int, b_int, dim);
87+
#else
8588
acc = fdotp_v64b(a_int, b_int, dim);
89+
#endif
8690
result[cid] = acc;
8791

8892
// Wait for all cores to finish

0 commit comments

Comments
 (0)