GPU: Temporary workaround for bug in llvm IL to SPIR-V converter needed for OpenCL2

davidrohr · davidrohr · commit e814b0ac745e · 2020-02-21T04:36:14.000+01:00
diff --git a/GPU/Common/GPUCommonMath.h b/GPU/Common/GPUCommonMath.h
@@ -138,7 +138,7 @@ GPUhdi() unsigned int GPUCommonMath::Clz(unsigned int x)
 
 GPUhdi() unsigned int GPUCommonMath::Popcount(unsigned int x)
 {
-#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__)) && (!defined(__OPENCL__) || defined(__OPENCLCPP__))
+#if (defined(__GNUC__) || defined(__clang__) || defined(__CUDACC__) || defined(__HIPCC__)) && (!defined(__OPENCL__) /*|| defined(__OPENCLCPP__)*/) // TODO: remove OPENCLCPP workaround when reported SPIR-V bug is fixed
   return CHOICE(__builtin_popcount(x), __popc(x), __builtin_popcount(x)); // use builtin if available
 #else
   unsigned int retVal = 0;

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ GPUhdi() unsigned int GPUCommonMath::Clz(unsigned int x)`
`138`	`138`
`139`	`139`	`GPUhdi() unsigned int GPUCommonMath::Popcount(unsigned int x)`
`140`	`140`	`{`
`141`		`-#if (defined(__GNUC__) \|\| defined(__clang__) \|\| defined(__CUDACC__) \|\| defined(__HIPCC__)) && (!defined(__OPENCL__) \|\| defined(__OPENCLCPP__))`
	`141`	`+#if (defined(__GNUC__) \|\| defined(__clang__) \|\| defined(__CUDACC__) \|\| defined(__HIPCC__)) && (!defined(__OPENCL__) /\|\| defined(__OPENCLCPP__)/) // TODO: remove OPENCLCPP workaround when reported SPIR-V bug is fixed`
`142`	`142`	`return CHOICE(__builtin_popcount(x), __popc(x), __builtin_popcount(x)); // use builtin if available`
`143`	`143`	`#else`
`144`	`144`	`unsigned int retVal = 0;`