diff options
author | Henry Cook <hcook@eecs.berkeley.edu> | 2014-11-06 17:24:39 -0800 |
---|---|---|
committer | Henry Cook <hcook@eecs.berkeley.edu> | 2014-11-07 16:52:51 -0800 |
commit | d537de7deffa6036dab573ff174b7f8c8e470437 (patch) | |
tree | ddc921eb337cda4889570f0251bdba85059a2531 /benchmarks/mt-matmul | |
parent | 5afc6b9bc2e3685220cffb3da66ad9f5f1f7b14f (diff) | |
download | riscv-tests-d537de7deffa6036dab573ff174b7f8c8e470437.zip riscv-tests-d537de7deffa6036dab573ff174b7f8c8e470437.tar.gz riscv-tests-d537de7deffa6036dab573ff174b7f8c8e470437.tar.bz2 |
Clean up canonical mt benchmarks and reorganize extra versions in /mt. All versions support support at least 1/2/4 threads.
Diffstat (limited to 'benchmarks/mt-matmul')
-rw-r--r-- | benchmarks/mt-matmul/bmark.mk | 1 | ||||
-rw-r--r-- | benchmarks/mt-matmul/dataset.h | 7 | ||||
-rw-r--r-- | benchmarks/mt-matmul/matmul.c | 20 | ||||
-rw-r--r-- | benchmarks/mt-matmul/mt-matmul.c | 82 |
4 files changed, 32 insertions, 78 deletions
diff --git a/benchmarks/mt-matmul/bmark.mk b/benchmarks/mt-matmul/bmark.mk index 4b7fcb7..6a7140f 100644 --- a/benchmarks/mt-matmul/bmark.mk +++ b/benchmarks/mt-matmul/bmark.mk @@ -10,6 +10,7 @@ mt_matmul_c_src = \ mt-matmul.c \ + matmul.c \ syscalls.c \ mt_matmul_riscv_src = \ diff --git a/benchmarks/mt-matmul/dataset.h b/benchmarks/mt-matmul/dataset.h index dde3ee4..2c59a33 100644 --- a/benchmarks/mt-matmul/dataset.h +++ b/benchmarks/mt-matmul/dataset.h @@ -1,9 +1,12 @@ +#ifndef __DATASET_H +#define __DATASET_H #define ARRAY_SIZE 1024 - #define DIM_SIZE 32 +typedef double data_t; + static data_t input1_data[ARRAY_SIZE] = { 0, 3, 2, 0, 3, 1, 0, 3, 2, 3, 2, 0, 3, 3, 1, 2, 3, 0, 0, 1, @@ -172,3 +175,5 @@ static data_t verify_data[ARRAY_SIZE] = 69, 73, 94, 89 }; + +#endif //__DATASET_H diff --git a/benchmarks/mt-matmul/matmul.c b/benchmarks/mt-matmul/matmul.c new file mode 100644 index 0000000..95fbe03 --- /dev/null +++ b/benchmarks/mt-matmul/matmul.c @@ -0,0 +1,20 @@ +#include "dataset.h" + +//-------------------------------------------------------------------------- +// single-thread, naive version +// +void __attribute__((noinline)) matmul(const int coreid, const int ncores, const int lda, const data_t A[], const data_t B[], data_t C[] ) +{ + int i, j, k; + + for ( i = 0; i < lda; i++ ) + { + for ( j = 0; j < lda; j++ ) + { + for ( k = coreid; k < lda; k+=ncores ) + { + C[i + j*lda] += A[j*lda + k] * B[k*lda + i]; + } + } + } +} diff --git a/benchmarks/mt-matmul/mt-matmul.c b/benchmarks/mt-matmul/mt-matmul.c index 1584a5d..2353962 100644 --- a/benchmarks/mt-matmul/mt-matmul.c +++ b/benchmarks/mt-matmul/mt-matmul.c @@ -25,62 +25,20 @@ //-------------------------------------------------------------------------- // Input/Reference Data -typedef double data_t; #include "dataset.h" - + //-------------------------------------------------------------------------- // Basic Utilities and Multi-thread Support -__thread unsigned long coreid; - #include "util.h" + -#define stringify_1(s) #s -#define stringify(s) stringify_1(s) -#define stats(code) do { \ - unsigned long _c = -rdcycle(), _i = -rdinstret(); \ - code; \ - _c += rdcycle(), _i += rdinstret(); \ - if (coreid == 0) \ - printf("%s: %ld cycles, %ld.%ld cycles/iter, %ld.%ld CPI\n", \ - stringify(code), _c, _c/DIM_SIZE/DIM_SIZE/DIM_SIZE, 10*_c/DIM_SIZE/DIM_SIZE/DIM_SIZE%10, _c/_i, 10*_c/_i%10); \ - } while(0) - //-------------------------------------------------------------------------- // matmul function -// single-thread, naive version -void __attribute__((noinline)) matmul_naive(const int lda, const data_t A[], const data_t B[], data_t C[] ) -{ - int i, j, k; - - if (coreid > 0) - return; - - for ( i = 0; i < lda; i++ ) - for ( j = 0; j < lda; j++ ) - { - for ( k = 0; k < lda; k++ ) - { - C[i + j*lda] += A[j*lda + k] * B[k*lda + i]; - } - } - -} - - + extern void __attribute__((noinline)) matmul(const int coreid, const int ncores, const int lda, const data_t A[], const data_t B[], data_t C[] ); -void __attribute__((noinline)) matmul(const int lda, const data_t A[], const data_t B[], data_t C[] ) -{ - - // ***************************** // - // **** ADD YOUR CODE HERE ***** // - // ***************************** // - // - // feel free to make a separate function for MI and MSI versions. - -} //-------------------------------------------------------------------------- // Main @@ -90,46 +48,16 @@ void __attribute__((noinline)) matmul(const int lda, const data_t A[], const da void thread_entry(int cid, int nc) { - coreid = cid; - - // static allocates data in the binary, which is visible to both threads static data_t results_data[ARRAY_SIZE]; - - // Execute the provided, naive matmul - barrier(nc); - stats(matmul_naive(DIM_SIZE, input1_data, input2_data, results_data); barrier(nc)); + stats(matmul(cid, nc, DIM_SIZE, input1_data, input2_data, results_data); barrier(nc), DIM_SIZE/DIM_SIZE/DIM_SIZE); - - // verify int res = verifyDouble(ARRAY_SIZE, results_data, verify_data); - if (res) - exit(res); - -#if 0 - // clear results from the first trial - size_t i; - if (coreid == 0) - for (i=0; i < ARRAY_SIZE; i++) - results_data[i] = 0; - barrier(nc); - - // Execute your faster matmul - barrier(nc); - stats(matmul(DIM_SIZE, input1_data, input2_data, results_data); barrier(nc)); - #ifdef DEBUG printArray("results:", ARRAY_SIZE, results_data); printArray("verify :", ARRAY_SIZE, verify_data); #endif - - // verify - res = verify(ARRAY_SIZE, results_data, verify_data); - if (res) - exit(res); - barrier(nc); -#endif - exit(0); + exit(res); } |