Signed-off-by: Grigore Lupescu <grigore.lupe...@intel.com>
---
backend/src/backend/gen_context.cpp | 39 +++++++++++++++++++++++++++---------
backend/src/backend/gen_encoder.cpp | 33 ++++++++++++++++++++++++++++++
backend/src/backend/gen_encoder.hpp | 1 +
utests/compiler_workgroup_reduce.cpp | 13 +++++++-----
4 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/backend/src/backend/gen_context.cpp
b/backend/src/backend/gen_context.cpp
index c8f0713..2f57c01 100644
--- a/backend/src/backend/gen_context.cpp
+++ b/backend/src/backend/gen_context.cpp
@@ -2937,18 +2937,37 @@ namespace gbe
}
}
} else if (wg_op == ir::WORKGROUP_OP_REDUCE_ADD) {
- GBE_ASSERT(tmp.type == theVal.type);
- GenRegister v = GenRegister::toUniform(tmp, theVal.type);
- for (uint32_t i = 0; i < simd; i++) {
- p->ADD(threadData, threadData, v);
- v.subnr += typeSize(theVal.type);
- if (v.subnr == 32) {
- v.subnr = 0;
- v.nr++;
+ tmp.hstride = GEN_HORIZONTAL_STRIDE_1;
+ tmp.vstride = GEN_VERTICAL_STRIDE_4;
+ tmp.width = GEN_WIDTH_4;
+
+ GBE_ASSERT(tmp.type == theVal.type);
+ GenRegister partialSum = GenRegister::toUniform(tmp, theVal.type);
+
+ // Opcode 84 not yet implemented, DP4 has only F as inputs, UD will
fail
+ if(threadData.type == GEN_TYPE_UD)
+ p->MOV(threadData, GenRegister::immud(1));
+ else
+ p->MOV(threadData, GenRegister::immf(1.0f));
+
+ /* initial sum compute */
+ p->DOT(tmp, threadData, tmp);
+
+ /* adjust offset, compute add with DOT/DP4, add result to partialSum */
+ for (uint32_t i = 1; i < simd/4; i++){
+ tmp.subnr += 4 * typeSize(theVal.type);
+ if (tmp.subnr == 32) {
+ tmp.subnr = 0;
+ tmp.nr++;
+ }
+
+ p->DOT(tmp, threadData, tmp);
+ p->ADD(partialSum, partialSum,
+ GenRegister::toUniform(tmp, theVal.type));
}
- }
- }
+ p->MOV(threadData, partialSum);
+ }
p->pop();
}
diff --git a/backend/src/backend/gen_encoder.cpp
b/backend/src/backend/gen_encoder.cpp
index 505f72a..c4964c6 100644
--- a/backend/src/backend/gen_encoder.cpp
+++ b/backend/src/backend/gen_encoder.cpp
@@ -832,6 +832,39 @@ namespace gbe
alu2(this, GEN_OPCODE_MUL, dest, src0, src1);
}
+ void GenEncoder::DOT(GenRegister dest, GenRegister src0, GenRegister src1) {
+ if (src0.type == GEN_TYPE_D ||
+ src0.type == GEN_TYPE_UD ||
+ src1.type == GEN_TYPE_D ||
+ src1.type == GEN_TYPE_UD)
+ assert(dest.type != GEN_TYPE_F);
+
+ if (src0.type == GEN_TYPE_F ||
+ (src0.file == GEN_IMMEDIATE_VALUE &&
+ src0.type == GEN_TYPE_VF)) {
+ assert(src1.type != GEN_TYPE_UD);
+ assert(src1.type != GEN_TYPE_D);
+ }
+
+ if (src1.type == GEN_TYPE_F ||
+ (src1.file == GEN_IMMEDIATE_VALUE &&
+ src1.type == GEN_TYPE_VF)) {
+ assert(src0.type != GEN_TYPE_UD);
+ assert(src0.type != GEN_TYPE_D);
+ }
+
+ assert(src0.file != GEN_ARCHITECTURE_REGISTER_FILE ||
+ src0.nr != GEN_ARF_ACCUMULATOR);
+ assert(src1.file != GEN_ARCHITECTURE_REGISTER_FILE ||
+ src1.nr != GEN_ARF_ACCUMULATOR);
+
+ GenNativeInstruction *insnQ1 = this->next(GEN_OPCODE_DP4);
+ this->setHeader(insnQ1);
+ insnQ1->header.execution_size = GEN_WIDTH_4;
+ this->setDst(insnQ1, dest);
+ this->setSrc0(insnQ1, src0);
+ this->setSrc1(insnQ1, src1);
+ }
void GenEncoder::NOP(void) {
GenNativeInstruction *insn = this->next(GEN_OPCODE_NOP);
diff --git a/backend/src/backend/gen_encoder.hpp
b/backend/src/backend/gen_encoder.hpp
index 6835196..65e8046 100644
--- a/backend/src/backend/gen_encoder.hpp
+++ b/backend/src/backend/gen_encoder.hpp
@@ -127,6 +127,7 @@ namespace gbe
ALU3(MAD)
ALU2(BRC)
ALU1(BRD)
+ ALU2(DOT)
#undef ALU1
#undef ALU2
#undef ALU2_MOD
diff --git a/utests/compiler_workgroup_reduce.cpp
b/utests/compiler_workgroup_reduce.cpp
index 4097843..9b3204a 100644
--- a/utests/compiler_workgroup_reduce.cpp
+++ b/utests/compiler_workgroup_reduce.cpp
@@ -147,7 +147,7 @@ static float test_array_float[64] =
void compiler_workgroup_reduce_min_float(void)
{
- const size_t n = 60;
+ const size_t n = 64;
float* src = test_array_float;
// Setup kernel and buffers
@@ -222,8 +222,11 @@ void compiler_workgroup_reduce_add_float(void)
locals[0] = n;
float cpu_res = 0;
- for (size_t i = 0; i < n; i++)
- cpu_res += src[i];
+ for (size_t i = 0; i < n; i++){
+ src[i] = 1.3f;
+ cpu_res += src[i];}
+ printf("CPU: %f - GPU:", cpu_res);
+ // CPU: 54.599979 - GPU:54.599998 - difference ?
OCL_MAP_BUFFER(0);
memcpy(buf_data[0], src, n * sizeof(float));
@@ -235,8 +238,8 @@ void compiler_workgroup_reduce_add_float(void)
// Compare
OCL_MAP_BUFFER(1);
for (int32_t i = 0; i < (int32_t) n; ++i) {
- //printf("%f ", ((float *)buf_data[1])[i]);
- OCL_ASSERT(((float *)buf_data[1])[i] == cpu_res);
+ printf("%f ", ((float *)buf_data[1])[i]);
+ //OCL_ASSERT(((float *)buf_data[1])[i] == cpu_res);
}
OCL_UNMAP_BUFFER(1);
}
--
2.1.4
_______________________________________________
Beignet mailing list
Beignet@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/beignet
