Remove lookuph and friends.

cubing · Aug 21, 2023 · 313a610 · 313a610
1 parent 11c2d73
commit 313a610
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/src/cpp/prunetable.h b/src/cpp/prunetable.h
@@ -87,24 +87,13 @@ struct prunetable {
    prunetable& operator=(prunetable &&) noexcept = delete ;
    void filltable(const puzdef &pd, int d) ;
    void checkextend(const puzdef &pd, int ignorelookups=0) ;
-   int lookuph(ull h) const { // deprecate this
-      h = indexhash(h) ;
-      int v = 3 & (mem[h >> 5] >> ((h & 31) * 2)) ;
-      if (v == 3)
-         return (mem[(h >> 5) & ~7] & 15) - 1 ;
-      else
-         return 2 - v + baseval ;
-   }
    int lookuphindexed(ull h) const {
       int v = 3 & (mem[h >> 5] >> ((h & 31) * 2)) ;
       if (v == 3)
          return (mem[(h >> 5) & ~7] & 15) - 1 ;
       else
          return 2 - v + baseval ;
    }
-   void prefetch(ull h) const { // deprecate this
-      __builtin_prefetch(mem+(indexhash(h) >> 5)) ;
-   }
    ull prefetchindexed(ull h) const {
       __builtin_prefetch(mem+(h >> 5)) ;
       return h ;

diff --git a/src/cpp/test.cpp b/src/cpp/test.cpp
@@ -78,22 +78,22 @@ void timingtest(puzdef &pd) {
             int rmv = myrand(pd.moves.size()) ;
             pd.mul(p1, pd.moves[rmv].pos, p2) ;
             slowmodm2(pd, p2, p1) ;
-            sum += pt.lookuph(tgo[i&mask]) ;
-            tgo[i&mask] = fasthash(pd.totsize, p1) ;
-            pt.prefetch(tgo[i&mask]) ;
+            sum += pt.lookuphindexed(tgo[i&mask]) ;
+            tgo[i&mask] = pt.indexhash(pd.totsize, p1) ;
+            pt.prefetchindexed(tgo[i&mask]) ;
          }
       } else {
          for (int i=0; i<cnt; i += 2) {
             int rmv = myrand(pd.moves.size()) ;
             pd.mul(p1, pd.moves[rmv].pos, p2) ;
-            sum += pt.lookuph(tgo[i&mask]) ;
-            tgo[i&mask] = fasthash(pd.totsize, p2) ;
-            pt.prefetch(tgo[i&mask]) ;
+            sum += pt.lookuphindexed(tgo[i&mask]) ;
+            tgo[i&mask] = pt.indexhash(pd.totsize, p2) ;
+            pt.prefetchindexed(tgo[i&mask]) ;
             rmv = myrand(pd.moves.size()) ;
             pd.mul(p2, pd.moves[rmv].pos, p1) ;
-            sum += pt.lookuph(tgo[1+(i&mask)]) ;
-            tgo[1+(i&mask)] = fasthash(pd.totsize, p1) ;
-            pt.prefetch(tgo[1+(i&mask)]) ;
+            sum += pt.lookuphindexed(tgo[1+(i&mask)]) ;
+            tgo[1+(i&mask)] = pt.indexhash(pd.totsize, p1) ;
+            pt.prefetchindexed(tgo[1+(i&mask)]) ;
          }
       }
       tim = duration() ;