[med-svn] [Git][med-team/khmer][debian/experimental] try #2

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch debian/experimental at Debian Med / khmer


Commits:
662bc4c0 by Michael R. Crusoe at 2024-02-18T16:29:24+01:00
try #2

- - - - -


1 changed file:

- debian/patches/non-x86-compat.patch


Changes:

=====================================
debian/patches/non-x86-compat.patch
=====================================
@@ -8,13 +8,15 @@
  static inline int popcnt(uint64_t val)
  {
  	asm("popcnt %[val], %[val]"
-@@ -55,19 +56,9 @@
+@@ -55,19 +56,13 @@
  			: "cc");
  	return val;
  }
 -
 -static inline int64_t bitscanreverse(uint64_t val)
--{
++#elif __has_builtin(__builtin_popcount)
++static inline int popcnt(uint64_t val)
+ {
 -	if (val == 0) {
 -		return -1;
 -	} else {
@@ -24,14 +26,14 @@
 -				: "cc");
 -		return val;
 -	}
--}
-+#elif __has_builtin(__builtin_popcount)
-+  #define popcnt(val) __builtin_popcount(val)
++	int result = __builtin_popcount(val);
++	return result;
+ }
 +#endif
  
  static inline int popcntv(const uint64_t val, int ignore)
  {
-@@ -77,6 +68,7 @@
+@@ -77,6 +72,7 @@
  		return popcnt(val);
  }
  
@@ -39,7 +41,7 @@
  // Returns the number of 1s up to (and including) the pos'th bit
  // Bits are numbered from 0
  static inline int bitrank(uint64_t val, int pos) {
-@@ -87,7 +79,12 @@
+@@ -87,7 +83,13 @@
  			: "cc");
  	return val;
  }
@@ -47,13 +49,14 @@
 +#elif __has_builtin(__builtin_popcount)
 +static inline int bitrank(uint64_t val, int pos) {
 +	val = val & ((2ULL << pos) - 1);
-+	return __builtin_popcount(val);
++	int result = __builtin_popcount(val);
++	return result;
 +}
 +#endif
  /**
   * Returns the position of the k-th 1 in the 64-bit word x.
   * k is 0-based, so k=0 returns the position of the first 1.
-@@ -737,116 +734,6 @@
+@@ -737,116 +739,6 @@
  	qf->noccupied_slots += ninserts;
  }
  
@@ -170,7 +173,7 @@
  
  /*****************************************************************************
   * Code that uses the above to implement a QF with keys and inline counters. *
-@@ -1310,49 +1197,6 @@
+@@ -1310,49 +1202,6 @@
  	}
  }
  
@@ -220,7 +223,7 @@
  
  void qf_destroy(QF *qf)
  {
-@@ -1432,15 +1276,6 @@
+@@ -1432,15 +1281,6 @@
  		insert(qf, key, count);
  }
  



View it on GitLab: https://salsa.debian.org/med-team/khmer/-/commit/662bc4c0ef548471c8296b06145dd05585a9b5d8

-- 
View it on GitLab: https://salsa.debian.org/med-team/khmer/-/commit/662bc4c0ef548471c8296b06145dd05585a9b5d8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240218/c249ba67/attachment-0001.htm>