Commit 996ad7a
Tsung-Wei Huang
modified main.cpp of benchmarks
1 parent 902317f commit 996ad7a
2 files changed
Lines changed: 15 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,9 +8,6 @@ int main(int argc, char* argv[]) { | |||
| 8 | 8 | num_threads = std::atoi(argv[1]); | |
| 9 | 9 | } | |
| 10 | 10 | ||
| 11 | - double omp_time {0.0}; | ||
| 12 | - double tbb_time {0.0}; | ||
| 13 | - double tf_time {0.0}; | ||
| 14 | 11 | int rounds {5}; | |
| 15 | 12 | ||
| 16 | 13 | std::cout << std::setw(12) << "|V|+|E|" | |
@@ -23,6 +20,10 @@ int main(int argc, char* argv[]) { | |||
| 23 | 20 | ||
| 24 | 21 | for(int i=1; i<=451; i += 15) { | |
| 25 | 22 | ||
| 23 | + double omp_time {0.0}; | ||
| 24 | + double tbb_time {0.0}; | ||
| 25 | + double tf_time {0.0}; | ||
| 26 | + | ||
| 26 | 27 | LevelGraph graph(i, i); | |
| 27 | 28 | ||
| 28 | 29 | for(int j=0; j<rounds; ++j) { | |
@@ -37,9 +38,9 @@ int main(int argc, char* argv[]) { | |||
| 37 | 38 | } | |
| 38 | 39 | ||
| 39 | 40 | std::cout << std::setw(12) << graph.graph_size() | |
| 40 | - << std::setw(12) << omp_time / rounds / 1e6 | ||
| 41 | - << std::setw(12) << tbb_time / rounds / 1e6 | ||
| 42 | - << std::setw(12) << tf_time / rounds / 1e6 | ||
| 41 | + << std::setw(12) << omp_time / rounds / 1e3 | ||
| 42 | + << std::setw(12) << tbb_time / rounds / 1e3 | ||
| 43 | + << std::setw(12) << tf_time / rounds / 1e3 | ||
| 43 | 44 | << std::setw(12) << omp_time / tf_time | |
| 44 | 45 | << std::setw(12) << tbb_time / tf_time | |
| 45 | 46 | << std::endl; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,9 +8,6 @@ int main(int argc, char* argv[]) { | |||
| 8 | 8 | num_threads = std::atoi(argv[1]); | |
| 9 | 9 | } | |
| 10 | 10 | ||
| 11 | - double omp_time {0.0}; | ||
| 12 | - double tbb_time {0.0}; | ||
| 13 | - double tf_time {0.0}; | ||
| 14 | 11 | int rounds {5}; | |
| 15 | 12 | ||
| 16 | 13 | std::cout << std::setw(12) << "# blocks" | |
@@ -21,12 +18,16 @@ int main(int argc, char* argv[]) { | |||
| 21 | 18 | << std::setw(12) << "speedup2" | |
| 22 | 19 | << '\n'; | |
| 23 | 20 | ||
| 24 | - for(int S=128; S<=4096; S += 128) { | ||
| 21 | + for(int S=1; S<=4096; S += 128) { | ||
| 25 | 22 | ||
| 26 | 23 | M = N = S; | |
| 27 | 24 | B = 8; | |
| 28 | 25 | MB = (M/B) + (M%B>0); | |
| 29 | 26 | NB = (N/B) + (N%B>0); | |
| 27 | + | ||
| 28 | + double omp_time {0.0}; | ||
| 29 | + double tbb_time {0.0}; | ||
| 30 | + double tf_time {0.0}; | ||
| 30 | 31 | ||
| 31 | 32 | init_matrix(); | |
| 32 | 33 | ||
@@ -39,9 +40,9 @@ int main(int argc, char* argv[]) { | |||
| 39 | 40 | destroy_matrix(); | |
| 40 | 41 | ||
| 41 | 42 | std::cout << std::setw(12) << MB*NB | |
| 42 | - << std::setw(12) << omp_time / rounds / 1e6 | ||
| 43 | - << std::setw(12) << tbb_time / rounds / 1e6 | ||
| 44 | - << std::setw(12) << tf_time / rounds / 1e6 | ||
| 43 | + << std::setw(12) << omp_time / rounds / 1e3 | ||
| 44 | + << std::setw(12) << tbb_time / rounds / 1e3 | ||
| 45 | + << std::setw(12) << tf_time / rounds / 1e3 | ||
| 45 | 46 | << std::setw(12) << omp_time / tf_time | |
| 46 | 47 | << std::setw(12) << tbb_time / tf_time | |
| 47 | 48 | << std::endl; | |
0 commit comments