Merge reducer destructor callback into reduce callback.

OpenCilk · Jul 13, 2022 · d8640ee · d8640ee
1 parent 8bff747
commit d8640ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/cilkscale/benchmark.cpp b/cilkscale/benchmark.cpp
@@ -42,13 +42,12 @@ using out_reducer = cilk::ostream_reducer<char>;
 static void timer_identity(void *view) {
   new (view) cilkscale_timer_t();
 }
-static void timer_reduce(void *left, void *right) { }
-static void timer_destroy(void *view) {
-  static_cast<cilkscale_timer_t *>(view)->~cilkscale_timer_t();
+static void timer_reduce(void *left, void *right) {
+  static_cast<cilkscale_timer_t *>(right)->~cilkscale_timer_t();
 }
 
 using cilkscale_timer_reducer =
-  cilkscale_timer_t _Hyperobject(timer_identity, timer_reduce, timer_destroy);
+  cilkscale_timer_t _Hyperobject(timer_identity, timer_reduce);
 
 #endif
 
@@ -69,7 +68,10 @@ class BenchmarkImpl_t {
 #if SERIAL_TOOL
   cilkscale_timer_t timer;
 #else
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcilk-ignored"
   cilkscale_timer_reducer timer;
+#pragma clang diagnostic pop
 #endif
 
   std::ostream &outs = std::cout;
@@ -157,14 +159,13 @@ BenchmarkImpl_t::BenchmarkImpl_t() {
 
 #if !SERIAL_TOOL
   __cilkrts_reducer_register
-    (&timer, sizeof timer, timer_identity, timer_reduce, timer_destroy);
+    (&timer, sizeof timer, timer_identity, timer_reduce);
 
   outf_red = new out_reducer((outf.is_open() ? outf : outs));
   __cilkrts_reducer_register
     (outf_red, sizeof *outf_red,
      &cilk::ostream_view<char, std::char_traits<char>>::identity,
-     &cilk::ostream_view<char, std::char_traits<char>>::reduce,
-     &cilk::ostream_view<char, std::char_traits<char>>::destruct);
+     &cilk::ostream_view<char, std::char_traits<char>>::reduce);
 #endif
 
   start.gettime();

diff --git a/cilkscale/cilkscale.cpp b/cilkscale/cilkscale.cpp
@@ -175,8 +175,7 @@ CilkscaleImpl_t::CilkscaleImpl_t() {
   shadow_stack = new shadow_stack_reducer();
   __cilkrts_reducer_register(shadow_stack, sizeof *shadow_stack,
                              &shadow_stack_t::identity,
-                             &shadow_stack_t::reduce,
-                             &shadow_stack_t::destruct);
+                             &shadow_stack_t::reduce);
 #endif
 
   const char *envstr = getenv("CILKSCALE_OUT");
@@ -188,8 +187,7 @@ CilkscaleImpl_t::CilkscaleImpl_t() {
   __cilkrts_reducer_register
     (outf_red, sizeof *outf_red,
      &cilk::ostream_view<char, std::char_traits<char>>::identity,
-     &cilk::ostream_view<char, std::char_traits<char>>::reduce,
-     &cilk::ostream_view<char, std::char_traits<char>>::destruct);
+     &cilk::ostream_view<char, std::char_traits<char>>::reduce);
 #endif
 
   shadow_stack->push(frame_type::SPAWNER);

diff --git a/cilkscale/shadow_stack.h b/cilkscale/shadow_stack.h
@@ -193,10 +193,8 @@ struct shadow_stack_t {
     }
     // Add the continuation span from the right stack into the left.
     l_bot.contin_bspan += r_bot.contin_bspan;
-  }
 
-  static void destruct(void *view) {
-    static_cast<shadow_stack_t *>(view)->~shadow_stack_t();
+    right->~shadow_stack_t();
   }
 
   duration_t elapsed_time() {
@@ -205,8 +203,7 @@ struct shadow_stack_t {
 };
 
 typedef shadow_stack_t _Hyperobject(shadow_stack_t::identity,
-                                    shadow_stack_t::reduce,
-                                    shadow_stack_t::destruct)
+                                    shadow_stack_t::reduce)
   shadow_stack_reducer;
 
 #endif