diff options
| author | Luo Xionghu <xionghu.luo@intel.com> | 2015-01-15 19:39:35 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2015-01-16 10:36:07 +0800 |
| commit | e4cf70cad7577a0bb0b47c5f834dc5d5ad9140f2 (patch) | |
| tree | 45f3bf7303b5c281014a3b48a6fc5779e2c19af6 | |
| parent | a32fb3e9a482d70e7dc7d08b5ad617d15684559a (diff) | |
fix the wrong implementation of popcount.Release_v1.0
add disassembly for cbit.
Signed-off-by: Luo Xionghu <xionghu.luo@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | backend/src/backend/gen/gen_mesa_disasm.c | 1 | ||||
| -rw-r--r-- | backend/src/libocl/tmpl/ocl_integer.tmpl.cl | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/backend/src/backend/gen/gen_mesa_disasm.c b/backend/src/backend/gen/gen_mesa_disasm.c index 162d459f..4822de38 100644 --- a/backend/src/backend/gen/gen_mesa_disasm.c +++ b/backend/src/backend/gen/gen_mesa_disasm.c @@ -67,6 +67,7 @@ static const struct { [GEN_OPCODE_LZD] = { .name = "lzd", .nsrc = 1, .ndst = 1 }, [GEN_OPCODE_FBH] = { .name = "fbh", .nsrc = 1, .ndst = 1 }, [GEN_OPCODE_FBL] = { .name = "fbl", .nsrc = 1, .ndst = 1 }, + [GEN_OPCODE_CBIT] = { .name = "cbit", .nsrc = 1, .ndst = 1 }, [GEN_OPCODE_F16TO32] = { .name = "f16to32", .nsrc = 1, .ndst = 1 }, [GEN_OPCODE_F32TO16] = { .name = "f32to16", .nsrc = 1, .ndst = 1 }, diff --git a/backend/src/libocl/tmpl/ocl_integer.tmpl.cl b/backend/src/libocl/tmpl/ocl_integer.tmpl.cl index 992727f6..28b9c208 100644 --- a/backend/src/libocl/tmpl/ocl_integer.tmpl.cl +++ b/backend/src/libocl/tmpl/ocl_integer.tmpl.cl @@ -87,15 +87,11 @@ OVERLOADABLE ulong clz(ulong x) { return v; } -OVERLOADABLE char popcount(char x) { - return x == 0 ? 0 : x < 0?__gen_ocl_cbit(x) - 24 : __gen_ocl_cbit(x); -} -OVERLOADABLE short popcount(short x) { - return x == 0 ? 0 : x < 0?__gen_ocl_cbit(x) - 16 : __gen_ocl_cbit(x); -} #define SDEF(TYPE) \ -OVERLOADABLE TYPE popcount(TYPE x){ return x == 0? 0:__gen_ocl_cbit(x);} +OVERLOADABLE TYPE popcount(TYPE x){ return __gen_ocl_cbit(x);} +SDEF(char); SDEF(uchar); +SDEF(short); SDEF(ushort); SDEF(int); SDEF(uint); |