fixup

Author: MLopez-Ibanez

c/hv4d.c

@@ -108,18 +108,18 @@ _attr_optimize_finite_math
 __attribute__((hot)) static bool
 restart_base_setup_z_and_closest(dlnode_t * restrict list, dlnode_t * restrict new)
 {
-    const double newx[] = { new->x[0], new->x[1], new->x[2] };
     // FIXME: This is the most expensive function in the HV4D+ algorithm.
+    const double newx[] = { new->x[0], new->x[1], new->x[2] };
     assert(list+1 == list->next[0]);
     dlnode_t * closest0 = list+1;
     dlnode_t * closest1 = list;
-    double closest0x[] = { closest0->x[0], closest0->x[1] };
-    double closest1x[] = { closest1->x[0], closest1->x[1] };
+    const double * closest0x = closest0->x;
+    const double * closest1x = closest1->x;
     dlnode_t * p = (list+1)->next[0];
     assert(p == list->next[0]->next[0]);
     restart_list_y(list);
     while (true) {
-        const double px[] =  { p->x[0], p->x[1], p->x[2] };
+        const double * restrict px =  p->x;
         // Help auto-vectorization.
         bool p_lt_new_0 = px[0] < newx[0];
         bool p_lt_new_1 = px[1] < newx[1];
@@ -133,12 +133,12 @@ restart_base_setup_z_and_closest(dlnode_t * restrict list, dlnode_t * restrict n
 
         if (p_leq_new_0 & p_leq_new_1 & p_leq_new_2) {
             //new->ndomr++;
-            assert(weakly_dominates(px, newx, 4));
+            assert(weakly_dominates(p->x, new->x, 4));
             return false;
         }
 
-        // if (!lexicographic_less_3d(px, newx))
-        if (!(p_lt_new_2 || (p_eq_new_2 && (p_lt_new_1 || (p_eq_new_1 && !p_leq_new_0))))) {
+        if (!lexicographic_less_3d(px, newx)) {
+            // if (!(p_lt_new_2 || (p_eq_new_2 && (p_lt_new_1 || (p_eq_new_1 && !p_leq_new_0))))) {
             new->closest[0] = closest0;
             new->closest[1] = closest1;
             new->prev[0] = p->prev[0];
@@ -156,12 +156,10 @@ restart_base_setup_z_and_closest(dlnode_t * restrict list, dlnode_t * restrict n
         ASSUME(!p_leq_new_0 || !p_leq_new_1);
         if (p_lt_new_1 && (px[0] < closest0x[0] || (px[0] == closest0x[0] && px[1] < closest0x[1]))) {
             closest0 = p;
-            closest0x[0] = px[0];
-            closest0x[1] = px[1];
+            closest0x = px;
         } else if (p_lt_new_0 && (px[1] < closest1x[1] || (px[1] == closest1x[1] && px[0] < closest1x[0]))) {
             closest1 = p;
-            closest1x[0] = px[0];
-            closest1x[1] = px[1];
+            closest1x = px;
         }
         p = p->next[0];
     }