From 9983e302384c12a975c8d2d5ae239f79fd8e1996 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 14 Jul 2017 14:34:22 +0100 Subject: Remove the old ARM code generator from ART's Optimizing compiler. The AArch32 VIXL-based code generator has been the default ARM code generator in ART for some time now. The old ARM code generator does not compile anymore; retiring it. Test: test.py Bug: 63316036 Change-Id: Iab8fbc4ac73eac2c1a809cd7b22fec6b619755db --- compiler/optimizing/codegen_test_utils.h | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'compiler/optimizing/codegen_test_utils.h') diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h index 00a16fe849..1b38acd8b0 100644 --- a/compiler/optimizing/codegen_test_utils.h +++ b/compiler/optimizing/codegen_test_utils.h @@ -35,7 +35,6 @@ #include "ssa_liveness_analysis.h" #ifdef ART_ENABLE_CODEGEN_arm -#include "code_generator_arm.h" #include "code_generator_arm_vixl.h" #endif @@ -84,26 +83,6 @@ class CodegenTargetConfig { // in ART, and callee-save in C. Alternatively, we could use or write // the stub that saves and restores all registers, but it is easier // to just overwrite the code generator. -class TestCodeGeneratorARM : public arm::CodeGeneratorARM { - public: - TestCodeGeneratorARM(HGraph* graph, - const ArmInstructionSetFeatures& isa_features, - const CompilerOptions& compiler_options) - : arm::CodeGeneratorARM(graph, isa_features, compiler_options) { - AddAllocatedRegister(Location::RegisterLocation(arm::R6)); - AddAllocatedRegister(Location::RegisterLocation(arm::R7)); - } - - void SetupBlockedRegisters() const OVERRIDE { - arm::CodeGeneratorARM::SetupBlockedRegisters(); - blocked_core_registers_[arm::R4] = true; - blocked_core_registers_[arm::R6] = false; - blocked_core_registers_[arm::R7] = false; - } -}; - -// A way to test the VIXL32-based code generator on ARM. This will replace -// TestCodeGeneratorARM when the VIXL32-based backend replaces the existing one. class TestCodeGeneratorARMVIXL : public arm::CodeGeneratorARMVIXL { public: TestCodeGeneratorARMVIXL(HGraph* graph, @@ -288,14 +267,6 @@ static void RunCode(CodegenTargetConfig target_config, } #ifdef ART_ENABLE_CODEGEN_arm -CodeGenerator* create_codegen_arm(HGraph* graph, const CompilerOptions& compiler_options) { - std::unique_ptr features_arm( - ArmInstructionSetFeatures::FromCppDefines()); - return new (graph->GetArena()) TestCodeGeneratorARM(graph, - *features_arm.get(), - compiler_options); -} - CodeGenerator* create_codegen_arm_vixl32(HGraph* graph, const CompilerOptions& compiler_options) { std::unique_ptr features_arm( ArmInstructionSetFeatures::FromCppDefines()); -- cgit v1.2.3