Commit 902317f
Tsung-Wei Huang
updated benchmark
1 parent ea17b45 commit 902317f
4 files changed
Lines changed: 14 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,7 +17,9 @@ int main(int argc, char* argv[]) { | |||
| 17 | 17 | << std::setw(12) << "OpenMP" | |
| 18 | 18 | << std::setw(12) << "TBB" | |
| 19 | 19 | << std::setw(12) << "Taskflow" | |
| 20 | - << std::endl; | ||
| 20 | + << std::setw(12) << "speedup1" | ||
| 21 | + << std::setw(12) << "speedup2" | ||
| 22 | + << '\n'; | ||
| 21 | 23 | ||
| 22 | 24 | for(int i=1; i<=451; i += 15) { | |
| 23 | 25 | ||
@@ -38,6 +40,8 @@ int main(int argc, char* argv[]) { | |||
| 38 | 40 | << std::setw(12) << omp_time / rounds / 1e6 | |
| 39 | 41 | << std::setw(12) << tbb_time / rounds / 1e6 | |
| 40 | 42 | << std::setw(12) << tf_time / rounds / 1e6 | |
| 43 | + << std::setw(12) << omp_time / tf_time | ||
| 44 | + << std::setw(12) << tbb_time / tf_time | ||
| 41 | 45 | << std::endl; | |
| 42 | 46 | } | |
| 43 | 47 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,6 +17,8 @@ int main(int argc, char* argv[]) { | |||
| 17 | 17 | << std::setw(12) << "OpenMP" | |
| 18 | 18 | << std::setw(12) << "TBB" | |
| 19 | 19 | << std::setw(12) << "Taskflow" | |
| 20 | + << std::setw(12) << "speedup1" | ||
| 21 | + << std::setw(12) << "speedup2" | ||
| 20 | 22 | << '\n'; | |
| 21 | 23 | ||
| 22 | 24 | for(int S=128; S<=4096; S += 128) { | |
@@ -40,6 +42,8 @@ int main(int argc, char* argv[]) { | |||
| 40 | 42 | << std::setw(12) << omp_time / rounds / 1e6 | |
| 41 | 43 | << std::setw(12) << tbb_time / rounds / 1e6 | |
| 42 | 44 | << std::setw(12) << tf_time / rounds / 1e6 | |
| 45 | + << std::setw(12) << omp_time / tf_time | ||
| 46 | + << std::setw(12) << tbb_time / tf_time | ||
| 43 | 47 | << std::endl; | |
| 44 | 48 | } | |
| 45 | 49 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,8 +17,8 @@ inline double **matrix {nullptr}; | |||
| 17 | 17 | ||
| 18 | 18 | // nominal operations | |
| 19 | 19 | inline double calc(double v0, double v1) { | |
| 20 | - //return (v0 == v1) ? std::pow(v0/v1, 4.0f) : std::max(v0,v1); | ||
| 21 | - return std::max(v0, v1); | ||
| 20 | + return (v0 == v1) ? std::pow(v0/v1, 4.0f) : std::max(v0,v1); | ||
| 21 | + //return std::max(v0, v1); | ||
| 22 | 22 | } | |
| 23 | 23 | ||
| 24 | 24 | // initialize the matrix | |
@@ -41,8 +41,8 @@ inline void destroy_matrix() { | |||
| 41 | 41 | } | |
| 42 | 42 | ||
| 43 | 43 | //computation given block row index i, block col index j | |
| 44 | - inline void block_computation(int i, int j){ | ||
| 45 | - return; | ||
| 44 | + inline int block_computation(int i, int j){ | ||
| 45 | + return i + j; | ||
| 46 | 46 | //int start_i = i*B; | |
| 47 | 47 | //int end_i = (i*B+B > M) ? M : i*B+B; | |
| 48 | 48 | //int start_j = j*B; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,8 +23,8 @@ void wavefront_taskflow(unsigned num_threads) { | |||
| 23 | 23 | } | |
| 24 | 24 | ); | |
| 25 | 25 | ||
| 26 | - if(i+1 < MB) node[i][j].precede(node[i+1][j]); | ||
| 27 | 26 | if(j+1 < NB) node[i][j].precede(node[i][j+1]); | |
| 27 | + if(i+1 < MB) node[i][j].precede(node[i+1][j]); | ||
| 28 | 28 | } | |
| 29 | 29 | } | |
| 30 | 30 | ||
0 commit comments