From 30b5cd0e6e87292a94cdfb00633e37bf3f7296f5 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Mon, 30 Dec 2024 16:40:36 +0000
Subject: x86/x86-64: Clean up `p{sll,srl,sra}` tests.

Test: m test-art-host-gtest
Change-Id: I0e9a0a684e4d4d0a80a343e7ac284d80f7a7bc2e
---
 compiler/utils/assembler_test.h | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/compiler/utils/assembler_test.h b/compiler/utils/assembler_test.h
index 05c79f3b21..e90187ccbc 100644
--- a/compiler/utils/assembler_test.h
+++ b/compiler/utils/assembler_test.h
@@ -316,9 +316,8 @@ class AssemblerTest : public AssemblerTestBase {
 
     for (auto reg : registers) {
       for (int64_t imm : imms) {
-        ImmType new_imm = CreateImmediate(imm);
         if (f != nullptr) {
-          (assembler_.get()->*f)(reg, new_imm + bias);
+          (assembler_.get()->*f)(reg, CreateImmediate(imm + bias));
         }
         std::string base = fmt;
 
@@ -516,6 +515,18 @@ class AssemblerTest : public AssemblerTestBase {
         bias);
   }
 
+  template <typename ImmType>
+  std::string RepeatFI(void (Ass::*f)(FPReg, ImmType),
+                       size_t imm_bits,
+                       const std::string& fmt) {
+    return RepeatTemplatedRegisterImmBits<FPReg, ImmType>(f,
+                                                          imm_bits,
+                                                          GetFPRegisters(),
+                                                          &AssemblerTest::GetFPRegName,
+                                                          fmt,
+                                                          /*bias=*/ 0);
+  }
+
   std::string RepeatFF(void (Ass::*f)(FPReg, FPReg), const std::string& fmt) {
     return RepeatTemplatedRegisters<FPReg, FPReg>(f,
                                                   GetFPRegisters(),
-- 
cgit v1.2.3-59-g8ed1b