From 219bf253e5158c4f3438e70864b8bf7235c1e193 Mon Sep 17 00:00:00 2001
From: Aart Bik <ajcbik@google.com>
Date: Wed, 15 Mar 2017 20:37:50 +0000
Subject: Revert "Introduce a number of MSA instructions for MIPS64"

This reverts commit dcabc8b740bf3066d59348ffdf21c164d2b27cb4.


Reason:
FAILING TESTS
valgrind-test-art-host-gtest-assembler_mips64_test32
ninja: build stopped: subcommand failed.
19:36:36 ninja failed with: exit status 1
make: *** [run_soong_ui] Error 1

Change-Id: If658375528d2a0f34bb6b22b6565fab1d863b3f5
---
 compiler/utils/assembler_test.h | 86 ++---------------------------------------
 1 file changed, 4 insertions(+), 82 deletions(-)

(limited to 'compiler/utils/assembler_test.h')

diff --git a/compiler/utils/assembler_test.h b/compiler/utils/assembler_test.h
index d265a44092..5c4875951b 100644
--- a/compiler/utils/assembler_test.h
+++ b/compiler/utils/assembler_test.h
@@ -42,10 +42,7 @@ enum class RegisterView {  // private
   kUseQuaternaryName,
 };
 
-// For use in the template as the default type to get a nonvector registers version.
-struct NoVectorRegs {};
-
-template<typename Ass, typename Reg, typename FPReg, typename Imm, typename VecReg = NoVectorRegs>
+template<typename Ass, typename Reg, typename FPReg, typename Imm>
 class AssemblerTest : public testing::Test {
  public:
   Ass* GetAssembler() {
@@ -149,8 +146,7 @@ class AssemblerTest : public testing::Test {
                                               std::string (AssemblerTest::*GetName1)(const Reg1&),
                                               std::string (AssemblerTest::*GetName2)(const Reg2&),
                                               const std::string& fmt,
-                                              int bias = 0,
-                                              int multiplier = 1) {
+                                              int bias = 0) {
     std::string str;
     std::vector<int64_t> imms = CreateImmediateValuesBits(abs(imm_bits), (imm_bits > 0));
 
@@ -158,7 +154,7 @@ class AssemblerTest : public testing::Test {
       for (auto reg2 : reg2_registers) {
         for (int64_t imm : imms) {
           ImmType new_imm = CreateImmediate(imm);
-          (assembler_.get()->*f)(*reg1, *reg2, new_imm * multiplier + bias);
+          (assembler_.get()->*f)(*reg1, *reg2, new_imm + bias);
           std::string base = fmt;
 
           std::string reg1_string = (this->*GetName1)(*reg1);
@@ -176,7 +172,7 @@ class AssemblerTest : public testing::Test {
           size_t imm_index = base.find(IMM_TOKEN);
           if (imm_index != std::string::npos) {
             std::ostringstream sreg;
-            sreg << imm * multiplier + bias;
+            sreg << imm + bias;
             std::string imm_string = sreg.str();
             base.replace(imm_index, ConstexprStrLen(IMM_TOKEN), imm_string);
           }
@@ -542,69 +538,6 @@ class AssemblerTest : public testing::Test {
     return str;
   }
 
-  std::string RepeatVV(void (Ass::*f)(VecReg, VecReg), const std::string& fmt) {
-    return RepeatTemplatedRegisters<VecReg, VecReg>(f,
-                                                    GetVectorRegisters(),
-                                                    GetVectorRegisters(),
-                                                    &AssemblerTest::GetVecRegName,
-                                                    &AssemblerTest::GetVecRegName,
-                                                    fmt);
-  }
-
-  std::string RepeatVVV(void (Ass::*f)(VecReg, VecReg, VecReg), const std::string& fmt) {
-    return RepeatTemplatedRegisters<VecReg, VecReg, VecReg>(f,
-                                                            GetVectorRegisters(),
-                                                            GetVectorRegisters(),
-                                                            GetVectorRegisters(),
-                                                            &AssemblerTest::GetVecRegName,
-                                                            &AssemblerTest::GetVecRegName,
-                                                            &AssemblerTest::GetVecRegName,
-                                                            fmt);
-  }
-
-  std::string RepeatVR(void (Ass::*f)(VecReg, Reg), const std::string& fmt) {
-    return RepeatTemplatedRegisters<VecReg, Reg>(
-        f,
-        GetVectorRegisters(),
-        GetRegisters(),
-        &AssemblerTest::GetVecRegName,
-        &AssemblerTest::GetRegName<RegisterView::kUsePrimaryName>,
-        fmt);
-  }
-
-  template <typename ImmType>
-  std::string RepeatVRIb(void (Ass::*f)(VecReg, Reg, ImmType),
-                         int imm_bits,
-                         const std::string& fmt,
-                         int bias = 0,
-                         int multiplier = 1) {
-    return RepeatTemplatedRegistersImmBits<VecReg, Reg, ImmType>(
-        f,
-        imm_bits,
-        GetVectorRegisters(),
-        GetRegisters(),
-        &AssemblerTest::GetVecRegName,
-        &AssemblerTest::GetRegName<RegisterView::kUsePrimaryName>,
-        fmt,
-        bias,
-        multiplier);
-  }
-
-  template <typename ImmType>
-  std::string RepeatVVIb(void (Ass::*f)(VecReg, VecReg, ImmType),
-                         int imm_bits,
-                         const std::string& fmt,
-                         int bias = 0) {
-    return RepeatTemplatedRegistersImmBits<VecReg, VecReg, ImmType>(f,
-                                                                    imm_bits,
-                                                                    GetVectorRegisters(),
-                                                                    GetVectorRegisters(),
-                                                                    &AssemblerTest::GetVecRegName,
-                                                                    &AssemblerTest::GetVecRegName,
-                                                                    fmt,
-                                                                    bias);
-  }
-
   // This is intended to be run as a test.
   bool CheckTools() {
     return test_helper_->CheckTools();
@@ -619,11 +552,6 @@ class AssemblerTest : public testing::Test {
     UNREACHABLE();
   }
 
-  virtual std::vector<VecReg*> GetVectorRegisters() {
-    UNIMPLEMENTED(FATAL) << "Architecture does not support vector registers";
-    UNREACHABLE();
-  }
-
   // Secondary register names are the secondary view on registers, e.g., 32b on 64b systems.
   virtual std::string GetSecondaryRegisterName(const Reg& reg ATTRIBUTE_UNUSED) {
     UNIMPLEMENTED(FATAL) << "Architecture does not support secondary registers";
@@ -1043,12 +971,6 @@ class AssemblerTest : public testing::Test {
     return sreg.str();
   }
 
-  std::string GetVecRegName(const VecReg& reg) {
-    std::ostringstream sreg;
-    sreg << reg;
-    return sreg.str();
-  }
-
   // If the assembly file needs a header, return it in a sub-class.
   virtual const char* GetAssemblyHeader() {
     return nullptr;
-- 
cgit v1.2.3-59-g8ed1b