Changeset 280650 in webkit

Timestamp:

Aug 4, 2021, 12:24:47 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r280609.
​https://bugs.webkit.org/show_bug.cgi?id=228791

Broke JSC tests on iOS.

Reverted changeset:

"[ARM64] Use link register instead of pinning a register for
materializing big load constants"
​https://bugs.webkit.org/show_bug.cgi?id=228710
​https://commits.webkit.org/r280609

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/B3Common.cpp (modified) (1 diff)
• b3/B3Common.h (modified) (1 diff)
• b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp (modified) (1 diff)
• b3/air/AirCode.cpp (modified) (1 diff)
• b3/air/AirLowerStackArgs.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-08-04  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r280609.
+        https://bugs.webkit.org/show_bug.cgi?id=228791
+
+        Broke JSC tests on iOS.
+
+        Reverted changeset:
+
+        "[ARM64] Use link register instead of pinning a register for
+        materializing big load constants"
+        https://bugs.webkit.org/show_bug.cgi?id=228710
+        https://commits.webkit.org/r280609
+
 2021-08-03  Yijia Huang  <yijia_huang@apple.com>
 

trunk/Source/JavaScriptCore/b3/B3Common.cpp

@@ -68 +68 @@
 }
 
-std::optional<GPRReg> linkRegister()
+std::optional<GPRReg> pinnedExtendedOffsetAddrRegister()
 {
 #if CPU(ARM64)
-    return MacroAssembler::linkRegister;
+    return MacroAssembler::dataTempRegister;
 #elif CPU(X86_64)
     return std::nullopt;

trunk/Source/JavaScriptCore/b3/B3Common.h

@@ -184 +184 @@
 }
 
-std::optional<GPRReg> linkRegister();
+std::optional<GPRReg> pinnedExtendedOffsetAddrRegister();
 
 } } // namespace JSC::B3

trunk/Source/JavaScriptCore/b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp

@@ -145 +145 @@
     }
 
-    ASSERT(linkRegister());
+    ASSERT(pinnedExtendedOffsetAddrRegister());
     auto addr = Arg::addr(Air::Tmp(GPRInfo::callFrameRegister), offsetFromFP);
     if (addr.isValidForm(Width64))
         return CCallHelpers::Address(GPRInfo::callFrameRegister, offsetFromFP);
-    GPRReg reg = *linkRegister();
+    GPRReg reg = *pinnedExtendedOffsetAddrRegister();
     jit.move(CCallHelpers::TrustedImmPtr(offsetFromFP), reg);
     jit.add64(GPRInfo::callFrameRegister, reg);

trunk/Source/JavaScriptCore/b3/air/AirCode.cpp

@@ -91 +91 @@
         });
 
+    if (auto reg = pinnedExtendedOffsetAddrRegister())
+        pinRegister(*reg);
+
     m_pinnedRegs.set(MacroAssembler::framePointerRegister);
 }

trunk/Source/JavaScriptCore/b3/air/AirLowerStackArgs.cpp

@@ -79 +79 @@
                         inst = Inst(inst.kind.opcode == Lea32 ? Add32 : Add64, inst.origin, Arg::imm(offset), base, inst.args[1]);
                     else {
-                        Air::Tmp tmp = Air::Tmp(*linkRegister());
+                        ASSERT(pinnedExtendedOffsetAddrRegister());
+                        Air::Tmp tmp = Air::Tmp(*pinnedExtendedOffsetAddrRegister());
                         Arg offsetArg = Arg::bigImm(offset);
                         insertionSet.insert(instIndex, Move, inst.origin, offsetArg, tmp);
@@ -128 +129 @@
                             return result;
 #if CPU(ARM64)
-                        Air::Tmp tmp = Air::Tmp(*linkRegister());
+                        ASSERT(pinnedExtendedOffsetAddrRegister());
+                        Air::Tmp tmp = Air::Tmp(*pinnedExtendedOffsetAddrRegister());
 
                         Arg largeOffset = Arg::isValidImmForm(offsetFromSP) ? Arg::imm(offsetFromSP) : Arg::bigImm(offsetFromSP);