Rename current register allocator implementation

This will allow a cleaner commit in an upcoming
refactoring of register allocation.

Test: m test-art-host

Change-Id: If420c97b088b3c934411ff83373e024003120746

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 2666835..3ed6ec9 100644 (file)
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -67,7 +67,7 @@ LIBART_COMPILER_SRC_FILES := \
        optimizing/parallel_move_resolver.cc \
        optimizing/prepare_for_register_allocation.cc \
        optimizing/reference_type_propagation.cc \
-       optimizing/register_allocator.cc \
+       optimizing/register_allocator_linear_scan.cc \
        optimizing/select_generator.cc \
        optimizing/sharpening.cc \
        optimizing/side_effects_analysis.cc \

diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index 6be79fa..6f487c5 100644 (file)
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -44,7 +44,7 @@
 #include "nodes.h"
 #include "optimizing_unit_test.h"
 #include "prepare_for_register_allocation.h"
-#include "register_allocator.h"
+#include "register_allocator_linear_scan.h"
 #include "ssa_liveness_analysis.h"
 #include "utils.h"
 #include "utils/arm/managed_register_arm.h"

diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index e14f603..0b4c569 100644 (file)
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -31,7 +31,7 @@
 #include "nodes.h"
 #include "optimization.h"
 #include "reference_type_propagation.h"
-#include "register_allocator.h"
+#include "register_allocator_linear_scan.h"
 #include "ssa_liveness_analysis.h"
 #include "utils/assembler.h"
 

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 6c1292c..03e82dd 100644 (file)
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -35,7 +35,7 @@
 #include "nodes.h"
 #include "optimizing_compiler.h"
 #include "reference_type_propagation.h"
-#include "register_allocator.h"
+#include "register_allocator_linear_scan.h"
 #include "quick/inline_method_analyser.h"
 #include "sharpening.h"
 #include "ssa_builder.h"

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index d6e09d7..80affc3 100644 (file)
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -81,7 +81,7 @@
 #include "oat_quick_method_header.h"
 #include "prepare_for_register_allocation.h"
 #include "reference_type_propagation.h"
-#include "register_allocator.h"
+#include "register_allocator_linear_scan.h"
 #include "select_generator.h"
 #include "sharpening.h"
 #include "side_effects_analysis.h"

diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator_linear_scan.cc
similarity index 99%
rename from compiler/optimizing/register_allocator.cc
rename to compiler/optimizing/register_allocator_linear_scan.cc
index 1b33408..90c845f 100644 (file)
--- a/compiler/optimizing/register_allocator.cc
+++ b/compiler/optimizing/register_allocator_linear_scan.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "register_allocator.h"
+#include "register_allocator_linear_scan.h"
 
 #include <iostream>
 #include <sstream>

diff --git a/compiler/optimizing/register_allocator.h b/compiler/optimizing/register_allocator_linear_scan.h
similarity index 97%
rename from compiler/optimizing/register_allocator.h
rename to compiler/optimizing/register_allocator_linear_scan.h
index 58600b7..1a1248b 100644 (file)
--- a/compiler/optimizing/register_allocator.h
+++ b/compiler/optimizing/register_allocator_linear_scan.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_H_
-#define ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_H_
+#ifndef ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_LINEAR_SCAN_H_
+#define ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_LINEAR_SCAN_H_
 
 #include "arch/instruction_set.h"
 #include "base/arena_containers.h"
@@ -243,4 +243,4 @@ class RegisterAllocator {
 
 }  // namespace art
 
-#endif  // ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_H_
+#endif  // ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATOR_LINEAR_SCAN_H_

diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc
index a9de7c3..602a14c 100644 (file)
--- a/compiler/optimizing/register_allocator_test.cc
+++ b/compiler/optimizing/register_allocator_test.cc
@@ -24,7 +24,7 @@
 #include "driver/compiler_options.h"
 #include "nodes.h"
 #include "optimizing_unit_test.h"
-#include "register_allocator.h"
+#include "register_allocator_linear_scan.h"
 #include "ssa_liveness_analysis.h"
 #include "ssa_phi_elimination.h"