Fix for -m 1500, -m 3000: Missing "defined" keyword

Fix for -m 1000: MD4_H1 copy/paste error
Fix for -m 8900, -m 9300: Invalid value for device_processor_cores for CPU devices
Fix for -m 9100: Variable salt2 initializer needed some clauses for clearness
Temporary limit gpu_accel for CPU devices to 1 for development phase
Mark pocl as too bleeding edge for production use, recommend native drivers
Remove workarounds for pocl
Rename VENDOR_ID_UNKNOWN to VENDOR_ID_GENERIC in host code
Rename IS_UNKNOWN to IS_GENERIC in kernel code

include/kernel_functions.c

@@ -33,12 +33,12 @@
 #define MD4_Go(x,y,z)   (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define MD4_F(x,y,z)    (((x) & (y)) | ((~(x)) & (z)))
 #define MD4_G(x,y,z)    (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
 #define MD4_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD5_H1(x,y,z)   (MD4_H((x), (y), (z)))
-#define MD5_H2(x,y,z)   (MD4_H((x), (y), (z)))
+#define MD4_H1(x,y,z)   (MD4_H((x), (y), (z)))
+#define MD4_H2(x,y,z)   (MD4_H((x), (y), (z)))
 #define MD4_Fo(x,y,z)   (MD4_F((x), (y), (z)))
 #define MD4_Go(x,y,z)   (MD4_G((x), (y), (z)))
 #endif
@@ -93,7 +93,7 @@
 #define MD5_Go(x,y,z)   (bitselect ((y), (x), (z)))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define MD5_F(x,y,z)    ((z) ^ ((x) & ((y) ^ (z))))
 #define MD5_G(x,y,z)    ((y) ^ ((z) & ((x) ^ (y))))
 #define MD5_H(x,y,z)    ((x) ^ (y) ^ (z))
@@ -146,16 +146,12 @@
 #define SHA1_F2o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define SHA1_F0(x,y,z)  ((z) ^ ((x) & ((y) ^ (z))))
 #define SHA1_F1(x,y,z)  ((x) ^ (y) ^ (z))
 #define SHA1_F2(x,y,z)  (((x) & (y)) | ((z) & ((x) ^ (y))))
-// either pocl or llvm fails and produces invalid optimized code
-//#define SHA1_F0o(x,y,z) (SHA1_F0 ((x), (y), (z)))
-//#define SHA1_F2o(x,y,z) (SHA1_F2 ((x), (y), (z)))
-// luckily we can use bitselect as a workaround
-#define SHA1_F0o(x,y,z) (bitselect ((z), (y), (x)))
-#define SHA1_F2o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
+#define SHA1_F0o(x,y,z) (SHA1_F0 ((x), (y), (z)))
+#define SHA1_F2o(x,y,z) (SHA1_F2 ((x), (y), (z)))
 #endif
 
 #define SHA1_STEP(f,a,b,c,d,e,x)    \
@@ -225,7 +221,7 @@
 #define SHA256_F1o(x,y,z) (bitselect ((z), (y), (x)))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define SHA256_F0(x,y,z)  (((x) & (y)) | ((z) & ((x) ^ (y))))
 #define SHA256_F1(x,y,z)  ((z) ^ ((x) & ((y) ^ (z))))
 #define SHA256_F0o(x,y,z) (SHA256_F0 ((x), (y), (z)))
@@ -269,7 +265,7 @@
 #define SHA384_F1o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define SHA384_F0o(x,y,z) (SHA384_F0 ((x), (y), (z)))
 #define SHA384_F1o(x,y,z) (SHA384_F1 ((x), (y), (z)))
 #endif
@@ -313,7 +309,7 @@
 #define SHA512_F1o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define SHA512_F0o(x,y,z) (SHA512_F0 ((x), (y), (z)))
 #define SHA512_F1o(x,y,z) (SHA512_F1 ((x), (y), (z)))
 #endif
@@ -370,7 +366,7 @@
 #define RIPEMD160_Io(x,y,z)   (bitselect ((y), (x), (z)))
 #endif
 
-#ifdef IS_UNKNOWN
+#ifdef IS_GENERIC
 #define RIPEMD160_F(x,y,z)    ((x) ^ (y) ^ (z))
 #define RIPEMD160_G(x,y,z)    ((z) ^ ((x) & ((y) ^ (z)))) /* x ? y : z */
 #define RIPEMD160_H(x,y,z)    (((x) | ~(y)) ^ (z))

include/kernel_vendor.h

@@ -18,11 +18,11 @@
 #endif
 
 #if VENDOR_ID == 9998 // temporary for dev
-#define IS_UNKNOWN
+#define IS_GENERIC
 #endif
 
 #if VENDOR_ID == 9999
-#define IS_UNKNOWN
+#define IS_GENERIC
 #endif
 
 /**

include/shared.h

@@ -87,14 +87,11 @@
 
 #define CL_VENDOR_NV          "NVIDIA Corporation"
 #define CL_VENDOR_AMD         "Advanced Micro Devices, Inc."
-#define CL_VENDOR_SDS         "Shiloh Distributed Solutions"
-#define CL_VENDOR_APPLE       "Apple"
 #define CL_VENDOR_POCL        "The pocl project"
 
 #define VENDOR_ID_AMD         4098
 #define VENDOR_ID_NV          4318
-#define VENDOR_ID_POCL        9998
-#define VENDOR_ID_UNKNOWN     9999
+#define VENDOR_ID_GENERIC     9999
 
 #define BLOCK_SIZE            64