From 7cf5607f472020711e36eedbbfebb25b40d3f90e Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 29 Oct 2019 10:17:53 +0000 Subject: Revert^2 "Implement Dot Product Vectorization for x86" This reverts commit b8c884e5f22390386b202459ab55ef3046631e42. And fixes a codegen bug (the reason why the original CL was reverted). Test: 684-checker-simd-dotprod Test: DEX2OAT_HOST_INSTRUCTION_SET_FEATURES="sse4.1" test.py --host Test: test.py --host --jit --gcstress Change-Id: Ibef925d1037abc9cb5f3d4dbd79f1d1eceae2f71 Signed-off-by: Shalini Salomi Bodapati --- compiler/optimizing/loop_optimization.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'compiler/optimizing/loop_optimization.cc') diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc index 9c4e9d25f7..567a41e2fd 100644 --- a/compiler/optimizing/loop_optimization.cc +++ b/compiler/optimizing/loop_optimization.cc @@ -1623,14 +1623,20 @@ bool HLoopOptimization::TrySetVectorType(DataType::Type type, uint64_t* restrict kNoDotProd; return TrySetVectorLength(16); case DataType::Type::kUint16: - case DataType::Type::kInt16: *restrictions |= kNoDiv | kNoAbs | kNoSignedHAdd | kNoUnroundedHAdd | - kNoSAD| + kNoSAD | kNoDotProd; return TrySetVectorLength(8); + case DataType::Type::kInt16: + *restrictions |= kNoDiv | + kNoAbs | + kNoSignedHAdd | + kNoUnroundedHAdd | + kNoSAD; + return TrySetVectorLength(8); case DataType::Type::kInt32: *restrictions |= kNoDiv | kNoSAD; return TrySetVectorLength(4); @@ -2166,7 +2172,7 @@ bool HLoopOptimization::VectorizeDotProdIdiom(LoopNode* node, bool generate_code, DataType::Type reduction_type, uint64_t restrictions) { - if (!instruction->IsAdd() || (reduction_type != DataType::Type::kInt32)) { + if (!instruction->IsAdd() || reduction_type != DataType::Type::kInt32) { return false; } -- cgit v1.2.3-59-g8ed1b