fix refs, compiler bug: #473

sstsimulator · Sep 10, 2019 · 3ba22e8 · 3ba22e8
1 parent 3ecc9c2
commit 3ba22e8
Show file tree

Hide file tree

Showing 27 changed files with 172 additions and 947 deletions.
diff --git a/bin/clang/pragmas.cc b/bin/clang/pragmas.cc
@@ -448,6 +448,7 @@ SSTNewPragma::visitDeclStmt(DeclStmt *stmt, Rewriter &r)
         std::stringstream sstr;
         sstr << type << " " << name << " = nullptr;"; //don't know why - but okay, semicolon needed
         replace(stmt, r, sstr.str(), *CI);
+        throw StmtDeleteException(stmt);
       } //boy, I really hope this doesn't allocate any memory
     }
   } else {
@@ -464,6 +465,7 @@ SSTNewPragma::visitBinaryOperator(BinaryOperator *op, Rewriter& r)
     pp.print(op->getLHS());
     pp.os << " = nullptr"; //don't know why - but okay, semicolon not needed
     replace(op, r, pp.os.str(),*CI);
+    throw StmtDeleteException(op);
   } //boy, I really hope this doesn't allocate any memory
 }
 

diff --git a/tests/reference/test_clang_pragma_sst_compute_global_var_cpp.ref-out b/tests/reference/test_clang_pragma_sst_compute_global_var_cpp.ref-out
@@ -9,7 +9,7 @@ int fxn()
   double* x = new double[10];
   int* idx = new int[5];
 
-  { uint64_t flops=0; uint64_t readBytes=0; uint64_t writeBytes=0; uint64_t intops=0; {  uint64_t tripCount0=((((*sstmac_bound_i))-(0)));  intops += tripCount0*1;{  uint64_t tripCount1=tripCount0*((((*sstmac_bound_j))-(0)));  flops += tripCount1*1; readBytes += tripCount1*36; writeBytes += tripCount1*12; intops += tripCount1*16;}}sstmac_computeDetailed(flops,intops,readBytes); }
+ { uint64_t flops=0; uint64_t readBytes=0; uint64_t writeBytes=0; uint64_t intops=0; {  uint64_t tripCount0=((((*sstmac_bound_i))-(0)));  intops += tripCount0*1;{  uint64_t tripCount1=tripCount0*((((*sstmac_bound_j))-(0)));  flops += tripCount1*1; readBytes += tripCount1*36; writeBytes += tripCount1*12; intops += tripCount1*16;}}sstmac_compute_detailed(flops,intops,readBytes); }
 
 
 

diff --git a/tests/reference/test_clang_puppet_pragma_omp_parallel_cpp.ref-out b/tests/reference/test_clang_puppet_pragma_omp_parallel_cpp.ref-out
@@ -7,7 +7,7 @@ int fxn()
   int* idx = new int[5];
   for (i=0; i < 5; ++i){
     mul *= i;
- { uint64_t flops=0; uint64_t readBytes=0; uint64_t writeBytes=0; uint64_t intops=0; {  uint64_t tripCount0=(((10)-(0)));  flops += tripCount0*1; readBytes += tripCount0*36; writeBytes += tripCount0*12; intops += tripCount0*16;}sstmac_computeDetailed(flops,intops,readBytes); }
+ { uint64_t flops=0; uint64_t readBytes=0; uint64_t writeBytes=0; uint64_t intops=0; {  uint64_t tripCount0=(((10)-(0)));  flops += tripCount0*1; readBytes += tripCount0*36; writeBytes += tripCount0*12; intops += tripCount0*16;}sstmac_compute_detailed(flops,intops,readBytes); }
 
 
 

diff --git a/tests/reference/test_core_apps_ping_all_dfly_plus_snappr.ref-out b/tests/reference/test_core_apps_ping_all_dfly_plus_snappr.ref-out
@@ -80,15 +80,15 @@ Rank 62 = 5000.5887ms
 Rank 63 = 5000.6057ms
 Aggregate time stats: state
         Inactive:          0.03623 s
-   idle:intra-up:          0.00227 s
+   idle:intra-up:          0.00226 s
  active:intra-up:          0.01152 s
 stalled:intra-up:          0.00484 s
-  idle:injection:          0.00722 s
+  idle:injection:          0.00720 s
 active:injection:          0.01248 s
- idle:intra-down:          0.00761 s
+ idle:intra-down:          0.00760 s
 active:intra-down:          0.01152 s
 stalled:intra-down:          0.00099 s
-     idle:global:          0.01171 s
+     idle:global:          0.01169 s
    active:global:          0.00819 s
   stalled:global:          0.00276 s
-Estimated total runtime of           5.00061618 seconds
+Estimated total runtime of           5.00061561 seconds
diff --git a/tests/reference/test_core_apps_ping_all_dfly_snappr.ref-out b/tests/reference/test_core_apps_ping_all_dfly_snappr.ref-out
@@ -79,13 +79,13 @@ Rank 55 = 5000.7021ms
 Rank 62 = 5000.7175ms
 Rank 63 = 5000.7255ms
 Aggregate time stats: state
-        Inactive:          0.06074 s
-      idle:intra:          0.00508 s
+        Inactive:          0.06073 s
+      idle:intra:          0.00507 s
     active:intra:          0.00947 s
    stalled:intra:          0.00177 s
-     idle:global:          0.00884 s
+     idle:global:          0.00883 s
    active:global:          0.00819 s
   stalled:global:          0.00505 s
-  idle:injection:          0.00993 s
+  idle:injection:          0.00992 s
 active:injection:          0.01248 s
-Estimated total runtime of           5.00073304 seconds
+Estimated total runtime of           5.00073277 seconds
diff --git a/tests/reference/test_core_apps_ping_all_dfly_snappr_rr.ref-out b/tests/reference/test_core_apps_ping_all_dfly_snappr_rr.ref-out
@@ -79,13 +79,13 @@ Rank 55 = 5000.7097ms
 Rank 62 = 5000.7381ms
 Rank 63 = 5000.7494ms
 Aggregate time stats: state
-        Inactive:          0.06239 s
+        Inactive:          0.06238 s
       idle:intra:          0.00573 s
     active:intra:          0.00947 s
    stalled:intra:          0.00183 s
      idle:global:          0.00952 s
    active:global:          0.00819 s
   stalled:global:          0.00521 s
-  idle:injection:          0.01159 s
+  idle:injection:          0.01158 s
 active:injection:          0.01248 s
-Estimated total runtime of           5.00075692 seconds
+Estimated total runtime of           5.00075665 seconds
diff --git a/tests/reference/test_core_apps_ping_all_fat_tree_snappr.ref-out b/tests/reference/test_core_apps_ping_all_fat_tree_snappr.ref-out
@@ -80,7 +80,7 @@ Rank 63 = 5000.5855ms
 Rank 62 = 5000.5869ms
 Aggregate time stats: state
         Inactive:          0.08623 s
-  idle:leaf->agg:          0.00523 s
+  idle:leaf->agg:          0.00524 s
 active:leaf->agg:          0.01152 s
 stalled:leaf->agg:          0.00577 s
   idle:injection:          0.00492 s
@@ -94,4 +94,4 @@ stalled:agg->core:          0.00169 s
   idle:core->agg:          0.02061 s
 active:core->agg:          0.00512 s
 stalled:core->agg:          0.00412 s
-Estimated total runtime of           5.00059642 seconds
+Estimated total runtime of           5.00059644 seconds
diff --git a/tests/reference/test_core_apps_ping_pong_mem_thrash.ref-out b/tests/reference/test_core_apps_ping_pong_mem_thrash.ref-out
@@ -35,9 +35,9 @@
 1304576:   0.5000 GB/s
 1304576:   0.5000 GB/s
 Aggregate time stats: state
-        Inactive:          0.73535 s
+        Inactive:          0.73536 s
           idle:X:          0.00009 s
         active:X:          0.01042 s
   idle:injection:          0.00009 s
 active:injection:          0.01042 s
-Estimated total runtime of           0.00564980 seconds
+Estimated total runtime of           0.00564984 seconds
diff --git a/tests/reference/test_coverage_edison_amm1.ref-out b/tests/reference/test_coverage_edison_amm1.ref-out
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-Rank 0 on MPI_Comm 0 passed test: 5.55e-04
-=======
-Rank 0 on MPI_Comm 0 passed test: 5.24e-04
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Rank 0 on MPI_Comm 0 passed test: 5.53e-04
 Rank 0 on MPI_Comm 0 passed test: 1.60e-02
 Rank 0 on MPI_Comm 0 passed test: 1.74e-02
 Rank 0 on MPI_Comm 0 passed test: 1.77e-02
@@ -32,14 +28,9 @@ Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
-<<<<<<< HEAD
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
-=======
-Rank 0 on MPI_Comm 2 passed test: 1.94e-02
-Rank 0 on MPI_Comm 2 passed test: 1.94e-02
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
-Rank 0 on MPI_Comm 2 passed test: 1.94e-02
+Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.94e-02
 Rank 0 on MPI_Comm 2 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
@@ -102,8 +93,4 @@ Rank 0 on MPI_Comm 3 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
-<<<<<<< HEAD
-Estimated total runtime of           0.01941230 seconds
-=======
-Estimated total runtime of           0.01940766 seconds
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Estimated total runtime of           0.01941028 seconds
diff --git a/tests/reference/test_coverage_edison_amm1_sculpin.ref-out b/tests/reference/test_coverage_edison_amm1_sculpin.ref-out
@@ -33,7 +33,6 @@ Rank 0 on MPI_Comm 2 passed test: 1.91e-02
 Rank 0 on MPI_Comm 2 passed test: 1.91e-02
 Rank 0 on MPI_Comm 2 passed test: 1.91e-02
 Rank 0 on MPI_Comm 2 passed test: 1.91e-02
-<<<<<<< HEAD
 Rank 0 on MPI_Comm 3 passed test: 1.92e-02
 Rank 0 on MPI_Comm 3 passed test: 1.92e-02
 Rank 0 on MPI_Comm 3 passed test: 1.92e-02
@@ -94,67 +93,4 @@ Rank 0 on MPI_Comm 3 passed test: 1.92e-02
 Rank 0 on MPI_Comm 3 passed test: 1.92e-02
 Rank 0 on MPI_Comm 3 passed test: 1.92e-02
 Rank 0 on MPI_Comm 3 passed test: 1.92e-02
-Estimated total runtime of           0.01917398 seconds
-=======
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Rank 0 on MPI_Comm 3 passed test: 1.91e-02
-Estimated total runtime of           0.01915106 seconds
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Estimated total runtime of           0.01917197 seconds
diff --git a/tests/reference/test_coverage_edison_amm2.ref-out b/tests/reference/test_coverage_edison_amm2.ref-out
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-Rank 0 on MPI_Comm 0 passed test: 5.55e-04
-=======
-Rank 0 on MPI_Comm 0 passed test: 5.24e-04
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Rank 0 on MPI_Comm 0 passed test: 5.53e-04
 Rank 0 on MPI_Comm 0 passed test: 1.60e-02
 Rank 0 on MPI_Comm 0 passed test: 1.74e-02
 Rank 0 on MPI_Comm 0 passed test: 1.77e-02
@@ -32,14 +28,9 @@ Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
-<<<<<<< HEAD
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.93e-02
-=======
-Rank 0 on MPI_Comm 2 passed test: 1.94e-02
-Rank 0 on MPI_Comm 2 passed test: 1.94e-02
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
-Rank 0 on MPI_Comm 2 passed test: 1.94e-02
+Rank 0 on MPI_Comm 2 passed test: 1.93e-02
 Rank 0 on MPI_Comm 2 passed test: 1.94e-02
 Rank 0 on MPI_Comm 2 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
@@ -102,8 +93,4 @@ Rank 0 on MPI_Comm 3 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
 Rank 0 on MPI_Comm 3 passed test: 1.94e-02
-<<<<<<< HEAD
-Estimated total runtime of           0.01941230 seconds
-=======
-Estimated total runtime of           0.01940766 seconds
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Estimated total runtime of           0.01941028 seconds
diff --git a/tests/reference/test_coverage_edison_amm3.ref-out b/tests/reference/test_coverage_edison_amm3.ref-out
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-Rank 0 on MPI_Comm 0 passed test: 6.70e-04
-=======
-Rank 0 on MPI_Comm 0 passed test: 6.75e-04
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Rank 0 on MPI_Comm 0 passed test: 6.68e-04
 Rank 0 on MPI_Comm 0 passed test: 1.65e-02
 Rank 0 on MPI_Comm 0 passed test: 1.80e-02
 Rank 0 on MPI_Comm 0 passed test: 1.83e-02
@@ -32,7 +28,6 @@ Rank 0 on MPI_Comm 2 passed test: 2.00e-02
 Rank 0 on MPI_Comm 2 passed test: 2.00e-02
 Rank 0 on MPI_Comm 2 passed test: 2.00e-02
 Rank 0 on MPI_Comm 2 passed test: 2.00e-02
-<<<<<<< HEAD
 Rank 0 on MPI_Comm 2 passed test: 2.00e-02
 Rank 0 on MPI_Comm 2 passed test: 2.00e-02
 Rank 0 on MPI_Comm 2 passed test: 2.01e-02
@@ -53,23 +48,6 @@ Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
-=======
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
-Rank 0 on MPI_Comm 3 passed test: 2.00e-02
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
@@ -105,7 +83,6 @@ Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
-<<<<<<< HEAD
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
@@ -116,7 +93,4 @@ Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
 Rank 0 on MPI_Comm 3 passed test: 2.01e-02
-Estimated total runtime of           0.02012599 seconds
-=======
-Estimated total runtime of           0.02007531 seconds
->>>>>>> dca1ee9d4be0f8f477589e7ac2b165cdef4d5d04
+Estimated total runtime of           0.02012397 seconds