Merge pull request #5504 from dchopra001/getSupportsDepExt

Deprecate uses of getSupportsArch in Z codegen
eclipse-openj9 · Sep 2, 2020 · 6bb4e60 · 6bb4e60
2 parents 616c8dc + f09371b
commit 6bb4e60
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/compiler/z/codegen/OMRPeephole.cpp b/compiler/z/codegen/OMRPeephole.cpp
@@ -421,7 +421,7 @@ OMR::Z::Peephole::tryLoadStoreReduction(TR::InstOpCode::Mnemonic storeOpCode, ui
 bool
 OMR::Z::Peephole::tryToFoldLoadRegisterIntoSubsequentInstruction()
    {
-   if (!self()->comp()->target().cpu.getSupportsArch(TR::CPU::z196))
+   if (!self()->comp()->target().cpu.isAtLeast(OMR_PROCESSOR_S390_Z196))
       {
       return false;
       }
@@ -1042,7 +1042,7 @@ bool
 OMR::Z::Peephole::tryToReduceCRJLHIToLOCHI(TR::InstOpCode::Mnemonic compareMnemonic)
    {
    // This optimization relies on hardware instructions introduced in z13
-   if (!TR::Compiler->target.cpu.getSupportsArch(TR::CPU::z13))
+   if (!self()->comp()->target().cpu.isAtLeast(OMR_PROCESSOR_S390_Z13))
       return false;
 
    TR::S390RIEInstruction* branchInst = static_cast<TR::S390RIEInstruction*>(cursor);
@@ -1193,7 +1193,7 @@ bool
 OMR::Z::Peephole::tryToReduceLToLZRF(TR::InstOpCode::Mnemonic loadAndZeroRightMostByteMnemonic)
    {
    // This optimization relies on hardware instructions introduced in z13
-   if (!TR::Compiler->target.cpu.getSupportsArch(TR::CPU::z13))
+   if (!self()->comp()->target().cpu.isAtLeast(OMR_PROCESSOR_S390_Z13))
       return false;
 
    if (cursor->getNext()->getOpCodeValue() == TR::InstOpCode::NILL)