Browse Source

tests; rm trash file

master
Robin Thoni 4 years ago
parent
commit
f4329ff348
14 changed files with 44 additions and 12 deletions
  1. 1
    2
      .gitignore
  2. 27
    0
      OUTPUT.gigi
  3. 1
    1
      d2p.c
  4. BIN
      omp-merge-sort
  5. 2
    2
      tests/05.in
  6. 1
    1
      tests/05.out
  7. 2
    2
      tests/06.in
  8. 1
    1
      tests/06.out
  9. 2
    2
      tests/07.in
  10. 1
    1
      tests/07.out
  11. 2
    0
      tests/08.in
  12. 1
    0
      tests/08.out
  13. 2
    0
      tests/09.in
  14. 1
    0
      tests/09.out

+ 1
- 2
.gitignore View File

@@ -1,4 +1,3 @@
1
-omp-merge-sort-seq
2
-omp-merge-sort-par
1
+omp-merge-sort
3 2
 *.o
4 3
 *.swp

+ 27
- 0
OUTPUT.gigi View File

@@ -0,0 +1,27 @@
1
+  8cpu   0threads      1   0s   0ms   1us 148ns         1148
2
+  8cpu  12threads      1   0s  10ms 336us 128ns     10336128
3
+  8cpu  24threads      1   0s   7ms 842us 782ns      7842782
4
+  8cpu   0threads      2   0s   0ms   0us 800ns          800
5
+  8cpu  12threads      2   0s   4ms 207us 498ns      4207498
6
+  8cpu  24threads      2   0s   3ms 865us 148ns      3865148
7
+  8cpu   0threads      2   0s   0ms   0us 443ns          443
8
+  8cpu  12threads      2   0s   0ms 202us 381ns       202381
9
+  8cpu  24threads      2   0s   0ms  10us 973ns        10973
10
+  8cpu   0threads      5   0s   0ms   1us 231ns         1231
11
+  8cpu  12threads      5   0s   0ms  29us 112ns        29112
12
+  8cpu  24threads      5   0s   0ms  12us 482ns        12482
13
+  8cpu   0threads    500   0s   0ms 153us  13ns       153013
14
+  8cpu  12threads    500   0s   0ms  59us 179ns        59179
15
+  8cpu  24threads    500   0s   0ms  76us 431ns        76431
16
+  8cpu   0threads   1000   0s   0ms 399us 266ns       399266
17
+  8cpu  12threads   1000   0s   0ms 121us 844ns       121844
18
+  8cpu  24threads   1000   0s   0ms 119us 404ns       119404
19
+  8cpu   0threads   5000   0s   1ms 668us 603ns      1668603
20
+  8cpu  12threads   5000   0s   0ms 787us 216ns       787216
21
+  8cpu  24threads   5000   0s   0ms 645us 407ns       645407
22
+  8cpu   0threads  10000   0s   3ms 326us 829ns      3326829
23
+  8cpu  12threads  10000   0s   1ms 350us 242ns      1350242
24
+  8cpu  24threads  10000   0s   1ms 481us 441ns      1481441
25
+  8cpu   0threads  20000   0s   7ms  18us 976ns      7018976
26
+  8cpu  12threads  20000   0s   2ms 809us 267ns      2809267
27
+  8cpu  24threads  20000   0s   2ms 704us 117ns      2704117

+ 1
- 1
d2p.c View File

@@ -11,7 +11,7 @@ void merge_sort_sub_par(int* array, unsigned l, unsigned h, unsigned threads)
11 11
       #pragma omp parallel sections
12 12
       {
13 13
         #pragma omp section
14
-        merge_sort_sub_par(array, l, m, threads);
14
+        merge_sort_sub_par(array, l, m, n);
15 15
         #pragma omp section
16 16
         merge_sort_sub_par(array, m + 1, h, threads - n);
17 17
       }

BIN
omp-merge-sort View File


+ 2
- 2
tests/05.in
File diff suppressed because it is too large
View File


+ 1
- 1
tests/05.out
File diff suppressed because it is too large
View File


+ 2
- 2
tests/06.in
File diff suppressed because it is too large
View File


+ 1
- 1
tests/06.out
File diff suppressed because it is too large
View File


+ 2
- 2
tests/07.in
File diff suppressed because it is too large
View File


+ 1
- 1
tests/07.out
File diff suppressed because it is too large
View File


+ 2
- 0
tests/08.in
File diff suppressed because it is too large
View File


+ 1
- 0
tests/08.out
File diff suppressed because it is too large
View File


+ 2
- 0
tests/09.in
File diff suppressed because it is too large
View File


+ 1
- 0
tests/09.out
File diff suppressed because it is too large
View File


Loading…
Cancel
Save