Merge pull request #7329 from IBMJimmyk/directInflate

Sets format field for vmrghb and vmrglb instructions
eclipse · May 8, 2024 · da87f5d · da87f5d
2 parents 1bcf969 + 76c1b94
commit da87f5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/compiler/p/codegen/OMRInstOpCodeProperties.hpp b/compiler/p/codegen/OMRInstOpCodeProperties.hpp
@@ -9543,7 +9543,7 @@
    /* .description =    "vector merge high byte", */
    /* .prefix      = */ 0x00000000,
    /* .opcode      = */ 0x1000000C,
-   /* .format      = */ FORMAT_UNKNOWN,
+   /* .format      = */ FORMAT_VRT_VRA_VRB,
    /* .minimumALS  = */ OMR_PROCESSOR_PPC_P6,
    /* .properties  = */ PPCOpProp_IsVMX |
                         PPCOpProp_SyncSideEffectFree,
@@ -9579,7 +9579,7 @@
    /* .description =    "vector merge low byte", */
    /* .prefix      = */ 0x00000000,
    /* .opcode      = */ 0x1000010C,
-   /* .format      = */ FORMAT_UNKNOWN,
+   /* .format      = */ FORMAT_VRT_VRA_VRB,
    /* .minimumALS  = */ OMR_PROCESSOR_PPC_P6,
    /* .properties  = */ PPCOpProp_IsVMX |
                         PPCOpProp_SyncSideEffectFree,

diff --git a/fvtest/compilerunittest/p/BinaryEncoder.cpp b/fvtest/compilerunittest/p/BinaryEncoder.cpp
@@ -2297,6 +2297,12 @@ INSTANTIATE_TEST_CASE_P(VMX, PPCTrg1Src2EncodingTest, ::testing::ValuesIn(*TRTes
     std::make_tuple(TR::InstOpCode::vminfp,   TR::RealRegister::vr31, TR::RealRegister::vr0,  TR::RealRegister::vr0,  TRTest::BinaryInstruction("13e0044a")),
     std::make_tuple(TR::InstOpCode::vminfp,   TR::RealRegister::vr0,  TR::RealRegister::vr31, TR::RealRegister::vr0,  TRTest::BinaryInstruction("101f044a")),
     std::make_tuple(TR::InstOpCode::vminfp,   TR::RealRegister::vr0,  TR::RealRegister::vr0,  TR::RealRegister::vr31, TRTest::BinaryInstruction("1000fc4a")),
+    std::make_tuple(TR::InstOpCode::vmrghb,   TR::RealRegister::vr31, TR::RealRegister::vr0,  TR::RealRegister::vr0,  TRTest::BinaryInstruction("13e0000c")),
+    std::make_tuple(TR::InstOpCode::vmrghb,   TR::RealRegister::vr0,  TR::RealRegister::vr31, TR::RealRegister::vr0,  TRTest::BinaryInstruction("101f000c")),
+    std::make_tuple(TR::InstOpCode::vmrghb,   TR::RealRegister::vr0,  TR::RealRegister::vr0,  TR::RealRegister::vr31, TRTest::BinaryInstruction("1000f80c")),
+    std::make_tuple(TR::InstOpCode::vmrglb,   TR::RealRegister::vr31, TR::RealRegister::vr0,  TR::RealRegister::vr0,  TRTest::BinaryInstruction("13e0010c")),
+    std::make_tuple(TR::InstOpCode::vmrglb,   TR::RealRegister::vr0,  TR::RealRegister::vr31, TR::RealRegister::vr0,  TRTest::BinaryInstruction("101f010c")),
+    std::make_tuple(TR::InstOpCode::vmrglb,   TR::RealRegister::vr0,  TR::RealRegister::vr0,  TR::RealRegister::vr31, TRTest::BinaryInstruction("1000f90c")),
     std::make_tuple(TR::InstOpCode::vmulesh,  TR::RealRegister::vr31, TR::RealRegister::vr0,  TR::RealRegister::vr0,  TRTest::BinaryInstruction("13e00348")),
     std::make_tuple(TR::InstOpCode::vmulesh,  TR::RealRegister::vr0,  TR::RealRegister::vr31, TR::RealRegister::vr0,  TRTest::BinaryInstruction("101f0348")),
     std::make_tuple(TR::InstOpCode::vmulesh,  TR::RealRegister::vr0,  TR::RealRegister::vr0,  TR::RealRegister::vr31, TRTest::BinaryInstruction("1000fb48")),