Changeset 600ab7b in git

Timestamp:

Apr 23, 2021, 10:20:08 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

385385fcdf0edcaeeb0b2303522f87773a9cce04

Parents:

10c7e04a2f5f11b6ae3e82d97926e513c1c821b0

Message:

opt: red* routines

File:

• kernel/GBEngine/kstd2.cc (modified) (12 diffs)

kernel/GBEngine/kstd2.cc

@@ -771 +771 @@
     if (d != reddeg)
     {
-      if (d >= (long)strat->tailRing->bitmask)
+      if (UNLIKELY(d>=(long)strat->tailRing->bitmask))
       {
         if (h->pTotalDeg() >= (long)strat->tailRing->bitmask)
@@ -873 +873 @@
     if (d != reddeg)
     {
-      if (d >= (long)strat->tailRing->bitmask)
+      if (UNLIKELY(d>=(long)strat->tailRing->bitmask))
       {
         if (h->pTotalDeg() >= (long)strat->tailRing->bitmask)
@@ -993 +993 @@
       return 0;
     }
-    if (TEST_OPT_IDLIFT)
+    if (UNLIKELY(TEST_OPT_IDLIFT))
     {
       if (h->p!=NULL)
@@ -1739 +1739 @@
       return 0;
     }
-    if (TEST_OPT_IDLIFT)
+    if (UNLIKELY(TEST_OPT_IDLIFT))
     {
       if (h->p!=NULL)
@@ -1814 +1814 @@
     else if (d != reddeg)
     {
-      if (d>=(long)strat->tailRing->bitmask)
+      if (UNLIKELY(d>=(long)strat->tailRing->bitmask))
       {
         if (h->pTotalDeg() >= (long)strat->tailRing->bitmask)
@@ -1879 +1879 @@
       if (i > strat->tl)
         break;
-      //if (ei < h->ecart)
+      //if (ei <= h->ecart)
       //  break;
       if (li==1)
@@ -1902 +1902 @@
      * end of search: have to reduce with pi
      */
-    if (!TEST_OPT_REDTHROUGH && (pass!=0) && (ei > h->ecart))
+    if (UNLIKELY(!TEST_OPT_REDTHROUGH && (pass!=0) && (ei > h->ecart)))
     {
       h->GetTP(); // clears bucket
@@ -1942 +1942 @@
 #endif
 #if SBA_PRINT_OPERATIONS
-    sba_interreduction_operations  +=  pLength(strat->T[ii].p);
+    sba_interreduction_operations  +=  strat->T[ii].pLength;
 #endif
 #ifdef KDEBUG
@@ -1958 +1958 @@
       return 0;
     }
-    if (TEST_OPT_IDLIFT)
+    if (UNLIKELY(TEST_OPT_IDLIFT))
     {
       if (h->p!=NULL)
@@ -1977 +1977 @@
       }
     }
-    else if ((strat->syzComp > 0)&&(!TEST_OPT_REDTAIL_SYZ))
+    else if (UNLIKELY((strat->syzComp > 0)&&(!TEST_OPT_REDTAIL_SYZ)))
     {
       if (h->p!=NULL)
@@ -2011 +2011 @@
     pass++;
     d = h_d + h->ecart;
-    if (!TEST_OPT_REDTHROUGH && (strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
+    if (UNLIKELY(!TEST_OPT_REDTHROUGH
+    && (strat->Ll >= 0)
+    && ((d > reddeg) || (pass > strat->LazyPass))))
     {
       h->GetTP(); // clear bucket
@@ -2042 +2044 @@
     else if (d > reddeg)
     {
-      if (d>=(long)strat->tailRing->bitmask)
+      if (UNLIKELY(d>=(long)strat->tailRing->bitmask))
       {
         if (h->pTotalDeg()+h->ecart >= (long)strat->tailRing->bitmask)