From d33ae6a7b01f86d3dacf18fba2e38ac56eb7a584 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Sat, 31 Mar 2012 01:10:53 +1100 Subject: [PATCH] Revert "Use min() function on 2 vector output path in phatk kernel and don't use extra variable for both 2 and 4 vectors." This reverts commit 532179b24d9943e0e48e364682c05c006821a35d. Of no advantage. --- phatk120223.cl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phatk120223.cl b/phatk120223.cl index a268eb7e..9c4ee835 100644 --- a/phatk120223.cl +++ b/phatk120223.cl @@ -392,7 +392,8 @@ void search( const uint state0, const uint state1, const uint state2, const uint #define NFLAG (0x7F) #ifdef VECTORS4 - if (!(W[117].x & W[117].y & W[117].z & W[117].w)) { + bool result = W[117].x & W[117].y & W[117].z & W[117].w; + if (!result) { if (!W[117].x) output[FOUND] = output[NFLAG & W[3].x] = W[3].x; if (!W[117].y) @@ -403,7 +404,8 @@ void search( const uint state0, const uint state1, const uint state2, const uint output[FOUND] = output[NFLAG & W[3].w] = W[3].w; } #elif defined VECTORS2 - if (!(min(W[117].x, W[117].y))) { + bool result = W[117].x & W[117].y; + if (!result) { if (!W[117].x) output[FOUND] = output[NFLAG & W[3].x] = W[3].x; if (!W[117].y)