From 6b5afdd144d2bb3bf994240797834b5666b2cf98 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 22 Jan 2016 09:31:52 +0000 Subject: Revert "ARM/ARM64: Extend support of instruction combining." The test fails its checker parts. This reverts commit debeb98aaa8950caf1a19df490f2ac9bf563075b. Change-Id: I49929e15950c7814da6c411ecd2b640d12de80df --- compiler/optimizing/nodes.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 57fa558129..019be5d494 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -1226,16 +1226,6 @@ class HLoopInformationOutwardIterator : public ValueObject { M(UShr, BinaryOperation) \ M(Xor, BinaryOperation) \ -/* - * Instructions, shared across several (not all) architectures. - */ -#if !defined(ART_ENABLE_CODEGEN_arm) && !defined(ART_ENABLE_CODEGEN_arm64) -#define FOR_EACH_CONCRETE_INSTRUCTION_SHARED(M) -#else -#define FOR_EACH_CONCRETE_INSTRUCTION_SHARED(M) \ - M(MultiplyAccumulate, Instruction) -#endif - #ifndef ART_ENABLE_CODEGEN_arm #define FOR_EACH_CONCRETE_INSTRUCTION_ARM(M) #else @@ -1248,7 +1238,8 @@ class HLoopInformationOutwardIterator : public ValueObject { #else #define FOR_EACH_CONCRETE_INSTRUCTION_ARM64(M) \ M(Arm64DataProcWithShifterOp, Instruction) \ - M(Arm64IntermediateAddress, Instruction) + M(Arm64IntermediateAddress, Instruction) \ + M(Arm64MultiplyAccumulate, Instruction) #endif #define FOR_EACH_CONCRETE_INSTRUCTION_MIPS(M) @@ -1268,7 +1259,6 @@ class HLoopInformationOutwardIterator : public ValueObject { #define FOR_EACH_CONCRETE_INSTRUCTION(M) \ FOR_EACH_CONCRETE_INSTRUCTION_COMMON(M) \ - FOR_EACH_CONCRETE_INSTRUCTION_SHARED(M) \ FOR_EACH_CONCRETE_INSTRUCTION_ARM(M) \ FOR_EACH_CONCRETE_INSTRUCTION_ARM64(M) \ FOR_EACH_CONCRETE_INSTRUCTION_MIPS(M) \ @@ -5728,9 +5718,6 @@ class HParallelMove : public HTemplateInstruction<0> { } // namespace art -#if defined(ART_ENABLE_CODEGEN_arm) || defined(ART_ENABLE_CODEGEN_arm64) -#include "nodes_shared.h" -#endif #ifdef ART_ENABLE_CODEGEN_arm #include "nodes_arm.h" #endif -- cgit v1.2.3-59-g8ed1b