Changeset afaa70 in git

Timestamp:

Nov 10, 2017, 10:20:37 AM (6 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d4659730f5d051bbee5937a7f2b59acecc3f7aa0

Parents:

971a80779ac3cac292826e9392ea037d28a0ccd4

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-11-10 10:20:37+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-12-15 12:17:08+01:00

Message:

chg: add more likely/unlikely

File:

• kernel/GBEngine/syz4.cc (modified) (9 diffs)

kernel/GBEngine/syz4.cc

@@ -16 +16 @@
 
 #ifdef __GNUC__
-#define likely(X)   (__builtin_expect(X, 1))
-#define unlikely(X) (__builtin_expect(X, 0))
+#define likely(X)   (__builtin_expect(!!(X), 1))
+#define unlikely(X) (__builtin_expect(!!(X), 0))
 #else
 #define likely(X)   (X)
@@ -54 +54 @@
     }
     for (int j = R->N; j > 0; j--) {
-        if (variables[j-1] && p_GetExp(m, j, R) > 0) {
+        if (unlikely(variables[j-1] && p_GetExp(m, j, R) > 0)) {
             return true;
         }
@@ -88 +88 @@
     const ring r = currRing;
     lts_hash::const_iterator itr = hash_previous_module->find(p_GetComp(t, r));
-    if (itr == hash_previous_module->end()) {
+    if (unlikely(itr == hash_previous_module->end())) {
         return NULL;
     }
@@ -98 +98 @@
     const unsigned long q_not_sev = ~p_GetShortExpVector(q, r);
     for( ; itr_curr != itr_end; ++itr_curr) {
-        if (itr_curr->sev & q_not_sev
+        if (likely(itr_curr->sev & q_not_sev)
                 || unlikely(!(_p_LmDivisibleByNoComp(itr_curr->lt, q, r)))) {
             continue;
@@ -137 +137 @@
     const poly t = traverse_tail(s, c, previous_module, variables,
             hash_previous_module);
-    if (t != NULL) {
+    if (unlikely(t != NULL)) {
         s = p_Add_q(s, t, r);
     }
@@ -148 +148 @@
 {
     const poly tail = previous_module->m[comp]->next;
-    if (tail == NULL || !check_variables(variables, multiplier)) {
+    if (unlikely(tail == NULL) || !check_variables(variables, multiplier)) {
         return NULL;
     }
@@ -213 +213 @@
         const poly multiplier)
 {
-    if(itr->second == NULL) {
+    if (likely(itr->second == NULL)) {
         return NULL;
     }
     const ring r = currRing;
     poly p = p_Copy(itr->second, r);
-    if (!n_Equal(pGetCoeff(multiplier), pGetCoeff(itr->first), r)) {
+    if (likely(!n_Equal(pGetCoeff(multiplier), pGetCoeff(itr->first), r))) {
         number n = n_Div(pGetCoeff(multiplier), pGetCoeff(itr->first), r);
         p = p_Mult_nn(p, n, r);
@@ -232 +232 @@
     cache_term *T = &(Cache[comp]);
     cache_term::iterator itr = T->find(multiplier);
-    if (itr != T->end()) {
+    if (likely(itr != T->end())) {
         return get_from_cache_term(itr, multiplier);
     }
@@ -503 +503 @@
         poly p = res[1]->m[i];
         while (p != NULL) {
-            if (pGetComp(p) == comp) {
+            if (unlikely(pGetComp(p) == comp)) {
                 n_InpMult(pGetCoeff(p), coef_inv, r->cf);
             }