Changeset 251208 in webkit for trunk/Source/JavaScriptCore/b3

Timestamp:

Oct 16, 2019, 2:49:16 PM (6 years ago)

Author:

[email protected]

Message:

checkConsistency in Air O0 should only run when validation is enabled
​https://bugs.webkit.org/show_bug.cgi?id=203050

Reviewed by Saam Barati.

I resued the validateGraph and validateGraphAtEachPhase options
because adding a new option and threading it through all our
testing infrastructure didn't seem worthwhile for this.

• b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp:

(JSC::B3::Air::GenerateAndAllocateRegisters::checkConsistency):

File:

• trunk/Source/JavaScriptCore/b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp (modified) (1 diff)

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

@@ -48 +48 @@
 ALWAYS_INLINE void GenerateAndAllocateRegisters::checkConsistency()
 {
-#if !ASSERT_DISABLED
-    m_code.forEachTmp([&] (Tmp tmp) {
-        Reg reg = m_map[tmp].reg;
-        if (!reg)
-            return;
-
-        ASSERT(!m_availableRegs[tmp.bank()].contains(reg));
-        ASSERT(m_currentAllocation->at(reg) == tmp);
-    });
-
-    for (Reg reg : RegisterSet::allRegisters()) {
-        if (isDisallowedRegister(reg))
-            continue;
-
-        Tmp tmp = m_currentAllocation->at(reg);
-        if (!tmp) {
-            ASSERT(m_availableRegs[bankForReg(reg)].contains(reg));
-            continue;
-        }
-
-        ASSERT(!m_availableRegs[tmp.bank()].contains(reg));
-        ASSERT(m_map[tmp].reg == reg);
-    }
-#endif
+    // This isn't exactly the right option for this but adding a new one for just this seems silly.
+    if (Options::validateGraph() || Options::validateGraphAtEachPhase()) {
+        m_code.forEachTmp([&] (Tmp tmp) {
+            Reg reg = m_map[tmp].reg;
+            if (!reg)
+                return;
+
+            ASSERT(!m_availableRegs[tmp.bank()].contains(reg));
+            ASSERT(m_currentAllocation->at(reg) == tmp);
+        });
+
+        for (Reg reg : RegisterSet::allRegisters()) {
+            if (isDisallowedRegister(reg))
+                continue;
+
+            Tmp tmp = m_currentAllocation->at(reg);
+            if (!tmp) {
+                ASSERT(m_availableRegs[bankForReg(reg)].contains(reg));
+                continue;
+            }
+
+            ASSERT(!m_availableRegs[tmp.bank()].contains(reg));
+            ASSERT(m_map[tmp].reg == reg);
+        }
+    }
 }