Changeset 215073 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Apr 6, 2017, 5:26:53 PM (8 years ago)

Author:

[email protected]

Message:

Rename allocateStack to allocateStackByGraphColoring.

Rubber stamped by Saam Barati.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• b3/air/AirAllocateStack.cpp: Removed.
• b3/air/AirAllocateStack.h: Removed.
• b3/air/AirAllocateStackByGraphColoring.cpp: Copied from Source/JavaScriptCore/b3/air/AirAllocateStack.cpp.

(JSC::B3::Air::allocateStackByGraphColoring):
(JSC::B3::Air::allocateStack): Deleted.

• b3/air/AirAllocateStackByGraphColoring.h: Copied from Source/JavaScriptCore/b3/air/AirAllocateStack.h.
• b3/air/AirGenerate.cpp:

(JSC::B3::Air::prepareForGeneration):

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• b3/air/AirAllocateStackByGraphColoring.cpp (moved) (moved from trunk/Source/JavaScriptCore/b3/air/AirAllocateStack.cpp ) (2 diffs)
• b3/air/AirAllocateStackByGraphColoring.h (moved) (moved from trunk/Source/JavaScriptCore/b3/air/AirAllocateStack.h ) (2 diffs)
• b3/air/AirGenerate.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -76 +76 @@
     b3/air/AirAllocateRegistersByGraphColoring.cpp
     b3/air/AirAllocateRegistersByLinearScan.cpp
-    b3/air/AirAllocateStack.cpp
+    b3/air/AirAllocateStackByGraphColoring.cpp
     b3/air/AirArg.cpp
     b3/air/AirBasicBlock.cpp

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-04-06  Filip Pizlo  <[email protected]>
+
+        Rename allocateStack to allocateStackByGraphColoring.
+
+        Rubber stamped by Saam Barati.
+
+        * CMakeLists.txt:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * b3/air/AirAllocateStack.cpp: Removed.
+        * b3/air/AirAllocateStack.h: Removed.
+        * b3/air/AirAllocateStackByGraphColoring.cpp: Copied from Source/JavaScriptCore/b3/air/AirAllocateStack.cpp.
+        (JSC::B3::Air::allocateStackByGraphColoring):
+        (JSC::B3::Air::allocateStack): Deleted.
+        * b3/air/AirAllocateStackByGraphColoring.h: Copied from Source/JavaScriptCore/b3/air/AirAllocateStack.h.
+        * b3/air/AirGenerate.cpp:
+        (JSC::B3::Air::prepareForGeneration):
+
 2017-04-06  Michael Saboff  <[email protected]>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -935 +935 @@
                 0FEC85461BDACDAC0080FF74 /* B3ValueRep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEC84FC1BDACDAC0080FF74 /* B3ValueRep.cpp */; };
                 0FEC85471BDACDAC0080FF74 /* B3ValueRep.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC84FD1BDACDAC0080FF74 /* B3ValueRep.h */; };
-                0FEC856D1BDACDC70080FF74 /* AirAllocateStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEC85481BDACDC70080FF74 /* AirAllocateStack.cpp */; };
-                0FEC856E1BDACDC70080FF74 /* AirAllocateStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC85491BDACDC70080FF74 /* AirAllocateStack.h */; };
+                0FEC856D1BDACDC70080FF74 /* AirAllocateStackByGraphColoring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEC85481BDACDC70080FF74 /* AirAllocateStackByGraphColoring.cpp */; };
+                0FEC856E1BDACDC70080FF74 /* AirAllocateStackByGraphColoring.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC85491BDACDC70080FF74 /* AirAllocateStackByGraphColoring.h */; };
                 0FEC856F1BDACDC70080FF74 /* AirArg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEC854A1BDACDC70080FF74 /* AirArg.cpp */; };
                 0FEC85701BDACDC70080FF74 /* AirArg.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC854B1BDACDC70080FF74 /* AirArg.h */; };
@@ -3484 +3484 @@
                 0FEC84FC1BDACDAC0080FF74 /* B3ValueRep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = B3ValueRep.cpp; path = b3/B3ValueRep.cpp; sourceTree = "<group>"; };
                 0FEC84FD1BDACDAC0080FF74 /* B3ValueRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3ValueRep.h; path = b3/B3ValueRep.h; sourceTree = "<group>"; };
-                0FEC85481BDACDC70080FF74 /* AirAllocateStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirAllocateStack.cpp; path = b3/air/AirAllocateStack.cpp; sourceTree = "<group>"; };
-                0FEC85491BDACDC70080FF74 /* AirAllocateStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirAllocateStack.h; path = b3/air/AirAllocateStack.h; sourceTree = "<group>"; };
+                0FEC85481BDACDC70080FF74 /* AirAllocateStackByGraphColoring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirAllocateStackByGraphColoring.cpp; path = b3/air/AirAllocateStackByGraphColoring.cpp; sourceTree = "<group>"; };
+                0FEC85491BDACDC70080FF74 /* AirAllocateStackByGraphColoring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirAllocateStackByGraphColoring.h; path = b3/air/AirAllocateStackByGraphColoring.h; sourceTree = "<group>"; };
                 0FEC854A1BDACDC70080FF74 /* AirArg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirArg.cpp; path = b3/air/AirArg.cpp; sourceTree = "<group>"; };
                 0FEC854B1BDACDC70080FF74 /* AirArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirArg.h; path = b3/air/AirArg.h; sourceTree = "<group>"; };
@@ -5574 +5574 @@
                                 0F2AC5681E8A0BD10001EE3F /* AirAllocateRegistersByLinearScan.cpp */,
                                 0F2AC5691E8A0BD10001EE3F /* AirAllocateRegistersByLinearScan.h */,
-                                0FEC85481BDACDC70080FF74 /* AirAllocateStack.cpp */,
-                                0FEC85491BDACDC70080FF74 /* AirAllocateStack.h */,
+                                0FEC85481BDACDC70080FF74 /* AirAllocateStackByGraphColoring.cpp */,
+                                0FEC85491BDACDC70080FF74 /* AirAllocateStackByGraphColoring.h */,
                                 0FEC854A1BDACDC70080FF74 /* AirArg.cpp */,
                                 0FEC854B1BDACDC70080FF74 /* AirArg.h */,
@@ -8090 +8090 @@
                                 0F55F0F514D1063C00AC7649 /* AbstractPC.h in Headers */,
                                 5370B4F61BF26205005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.h in Headers */,
-                                0FEC856E1BDACDC70080FF74 /* AirAllocateStack.h in Headers */,
+                                0FEC856E1BDACDC70080FF74 /* AirAllocateStackByGraphColoring.h in Headers */,
                                 0FEC85701BDACDC70080FF74 /* AirArg.h in Headers */,
                                 0F64EAF31C4ECD0600621E9B /* AirArgInlines.h in Headers */,
@@ -9983 +9983 @@
                                 0F55F0F414D1063900AC7649 /* AbstractPC.cpp in Sources */,
                                 5370B4F51BF26202005C40FC /* AdaptiveInferredPropertyValueWatchpointBase.cpp in Sources */,
-                                0FEC856D1BDACDC70080FF74 /* AirAllocateStack.cpp in Sources */,
+                                0FEC856D1BDACDC70080FF74 /* AirAllocateStackByGraphColoring.cpp in Sources */,
                                 0FEC856F1BDACDC70080FF74 /* AirArg.cpp in Sources */,
                                 0FEC85711BDACDC70080FF74 /* AirBasicBlock.cpp in Sources */,

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

@@ -25 +25 @@
 
 #include "config.h"
-#include "AirAllocateStack.h"
+#include "AirAllocateStackByGraphColoring.h"
 
 #if ENABLE(B3_JIT)
@@ -132 +132 @@
 } // anonymous namespace
 
-void allocateStack(Code& code)
+void allocateStackByGraphColoring(Code& code)
 {
-    PhaseScope phaseScope(code, "allocateStack");
+    PhaseScope phaseScope(code, "allocateStackByGraphColoring");
 
     // Allocate all of the escaped slots in order. This is kind of a crazy algorithm to allow for

trunk/Source/JavaScriptCore/b3/air/AirAllocateStackByGraphColoring.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35 +35 @@
 // order and then it allocates the rest using first fit. Takes the opportunity to kill dead
 // assignments to stack slots, since it knows which ones are live. Also fixes ZDefs to anonymous
-// stack slots.
+// stack slots. Also coalesces spill slots whenever possible.
+//
+// This is meant to be an optimal stack allocator, focused on generating great code. It's not
+// particularly fast, though.
 
-void allocateStack(Code&);
+void allocateStackByGraphColoring(Code&);
 
 } } } // namespace JSC::B3::Air

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

@@ -31 +31 @@
 #include "AirAllocateRegistersByGraphColoring.h"
 #include "AirAllocateRegistersByLinearScan.h"
-#include "AirAllocateStack.h"
+#include "AirAllocateStackByGraphColoring.h"
 #include "AirCode.h"
 #include "AirEliminateDeadCode.h"
@@ -117 +117 @@
     // this by first-fit allocating stack slots. It should be pretty darn close to optimal, so we
     // shouldn't have to worry about this very much.
-    allocateStack(code);
+    allocateStackByGraphColoring(code);
     
     // If we coalesced moves then we can unbreak critical edges. This is the main reason for this