commit 8e895008a3e2f2813bb46cb0c6bc76884e46e9ac
author Nicolas Geoffray <ngeoffray@google.com> Tue Nov 26 14:05:40 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Nov 26 14:06:21 2019 +0000
tree c30e54521e1b31eb50e282b54be138f888d9870e
parent 7c9cfe8b3f986e7cbc18350ad7b9b72f58f5846c

Revert "Revert^2 "Implement Dot Product Vectorization for x86""

This reverts commit 7cf5607f472020711e36eedbbfebb25b40d3f90e.

Bug: 144947842

Reason for revert: Seems to have broken android.jvmti.cts.JvmtiHostTest1936#testJvmt

Change-Id: Ied6ff6ddf1cb2e3e76adcaa0fda5e36af254b7c5

compiler/optimizing/loop_optimization.cc

diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc
index 567a41e..9c4e9d2 100644
--- a/compiler/optimizing/loop_optimization.cc
+++ b/compiler/optimizing/loop_optimization.cc
@@ -1623,19 +1623,13 @@
                              kNoDotProd;
             return TrySetVectorLength(16);
           case DataType::Type::kUint16:
-            *restrictions |= kNoDiv |
-                             kNoAbs |
-                             kNoSignedHAdd |
-                             kNoUnroundedHAdd |
-                             kNoSAD |
-                             kNoDotProd;
-            return TrySetVectorLength(8);
           case DataType::Type::kInt16:
             *restrictions |= kNoDiv |
                              kNoAbs |
                              kNoSignedHAdd |
                              kNoUnroundedHAdd |
-                             kNoSAD;
+                             kNoSAD|
+                             kNoDotProd;
             return TrySetVectorLength(8);
           case DataType::Type::kInt32:
             *restrictions |= kNoDiv | kNoSAD;
@@ -2172,7 +2166,7 @@
                                               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;
   }