diff options
author | David Brazdil <dbrazdil@google.com> | 2015-04-03 16:02:44 +0100 |
---|---|---|
committer | David Brazdil <dbrazdil@google.com> | 2015-04-15 12:51:49 +0100 |
commit | 66d126ea06ce3f507d86ca5f0d1f752170ac9be1 (patch) | |
tree | 8e247db17ef085b55725b21c64d292414fd00b32 /compiler/optimizing | |
parent | 9bb3e8e10d7d9230a323511094a9e260062a1473 (diff) | |
download | android_art-66d126ea06ce3f507d86ca5f0d1f752170ac9be1.tar.gz android_art-66d126ea06ce3f507d86ca5f0d1f752170ac9be1.tar.bz2 android_art-66d126ea06ce3f507d86ca5f0d1f752170ac9be1.zip |
ART: Implement HBooleanNot instruction
Optimizations simplifying operations on boolean values (boolean
simplifier, instruction simplifier) can benefit from having a special
HInstruction for negating booleans in order to perform more transforms
and produce faster machine code.
This patch implements HBooleanNot as 'x xor 1', assuming that booleans
are 1-bit integers and allowing for a single-instruction negation on
all supported platforms.
Change-Id: I33a2649c1821255b18a86ca68ed16416063c739f
Diffstat (limited to 'compiler/optimizing')
-rw-r--r-- | compiler/optimizing/boolean_simplifier.cc | 4 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 15 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_arm64.cc | 11 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_x86.cc | 16 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_x86_64.cc | 16 | ||||
-rw-r--r-- | compiler/optimizing/nodes.h | 28 |
6 files changed, 88 insertions, 2 deletions
diff --git a/compiler/optimizing/boolean_simplifier.cc b/compiler/optimizing/boolean_simplifier.cc index be432c5a20..06328f2490 100644 --- a/compiler/optimizing/boolean_simplifier.cc +++ b/compiler/optimizing/boolean_simplifier.cc @@ -73,8 +73,8 @@ static HInstruction* GetOppositeCondition(HInstruction* cond) { } } else { // General case when 'cond' is another instruction of type boolean. - // Negate with 'cond == 0'. - return new (allocator) HEqual(cond, graph->GetIntConstant(0)); + DCHECK_EQ(cond->GetType(), Primitive::Type::kPrimBoolean); + return new (allocator) HBooleanNot(cond); } } diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 332c99ae64..72b07cd9e8 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -2657,6 +2657,21 @@ void InstructionCodeGeneratorARM::VisitNot(HNot* not_) { } } +void LocationsBuilderARM::VisitBooleanNot(HBooleanNot* bool_not) { + LocationSummary* locations = + new (GetGraph()->GetArena()) LocationSummary(bool_not, LocationSummary::kNoCall); + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap); +} + +void InstructionCodeGeneratorARM::VisitBooleanNot(HBooleanNot* bool_not) { + DCHECK_EQ(bool_not->InputAt(0)->GetType(), Primitive::kPrimBoolean); + LocationSummary* locations = bool_not->GetLocations(); + Location out = locations->Out(); + Location in = locations->InAt(0); + __ eor(out.AsRegister<Register>(), in.AsRegister<Register>(), ShifterOperand(1)); +} + void LocationsBuilderARM::VisitCompare(HCompare* compare) { LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(compare, LocationSummary::kNoCall); diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index a5ddd6ba82..7dfb5952eb 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -2279,6 +2279,17 @@ void InstructionCodeGeneratorARM64::VisitNot(HNot* instruction) { } } +void LocationsBuilderARM64::VisitBooleanNot(HBooleanNot* instruction) { + LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(instruction); + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap); +} + +void InstructionCodeGeneratorARM64::VisitBooleanNot(HBooleanNot* instruction) { + DCHECK_EQ(instruction->InputAt(0)->GetType(), Primitive::kPrimBoolean); + __ Eor(OutputRegister(instruction), InputRegisterAt(instruction, 0), vixl::Operand(1)); +} + void LocationsBuilderARM64::VisitNullCheck(HNullCheck* instruction) { LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(instruction, LocationSummary::kNoCall); diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 38f9ef8efe..79c00ba635 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -2915,6 +2915,22 @@ void InstructionCodeGeneratorX86::VisitNot(HNot* not_) { } } +void LocationsBuilderX86::VisitBooleanNot(HBooleanNot* bool_not) { + LocationSummary* locations = + new (GetGraph()->GetArena()) LocationSummary(bool_not, LocationSummary::kNoCall); + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetOut(Location::SameAsFirstInput()); +} + +void InstructionCodeGeneratorX86::VisitBooleanNot(HBooleanNot* bool_not) { + DCHECK_EQ(bool_not->InputAt(0)->GetType(), Primitive::kPrimBoolean); + LocationSummary* locations = bool_not->GetLocations(); + Location in = locations->InAt(0); + Location out = locations->Out(); + DCHECK(in.Equals(out)); + __ xorl(out.AsRegister<Register>(), Immediate(1)); +} + void LocationsBuilderX86::VisitCompare(HCompare* compare) { LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(compare, LocationSummary::kNoCall); diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index 7a928d4d7d..0dd44239ef 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -2974,6 +2974,22 @@ void InstructionCodeGeneratorX86_64::VisitNot(HNot* not_) { } } +void LocationsBuilderX86_64::VisitBooleanNot(HBooleanNot* bool_not) { + LocationSummary* locations = + new (GetGraph()->GetArena()) LocationSummary(bool_not, LocationSummary::kNoCall); + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetOut(Location::SameAsFirstInput()); +} + +void InstructionCodeGeneratorX86_64::VisitBooleanNot(HBooleanNot* bool_not) { + DCHECK_EQ(bool_not->InputAt(0)->GetType(), Primitive::kPrimBoolean); + LocationSummary* locations = bool_not->GetLocations(); + DCHECK_EQ(locations->InAt(0).AsRegister<CpuRegister>().AsRegister(), + locations->Out().AsRegister<CpuRegister>().AsRegister()); + Location out = locations->Out(); + __ xorl(out.AsRegister<CpuRegister>(), Immediate(1)); +} + void LocationsBuilderX86_64::VisitPhi(HPhi* instruction) { LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(instruction, LocationSummary::kNoCall); diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 5f50494482..e2eafe5565 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -676,6 +676,7 @@ class HLoopInformationOutwardIterator : public ValueObject { M(ArrayGet, Instruction) \ M(ArrayLength, Instruction) \ M(ArraySet, Instruction) \ + M(BooleanNot, UnaryOperation) \ M(BoundsCheck, Instruction) \ M(BoundType, Instruction) \ M(CheckCast, Instruction) \ @@ -2643,6 +2644,33 @@ class HNot : public HUnaryOperation { DISALLOW_COPY_AND_ASSIGN(HNot); }; +class HBooleanNot : public HUnaryOperation { + public: + explicit HBooleanNot(HInstruction* input) + : HUnaryOperation(Primitive::Type::kPrimBoolean, input) {} + + bool CanBeMoved() const OVERRIDE { return true; } + bool InstructionDataEquals(HInstruction* other) const OVERRIDE { + UNUSED(other); + return true; + } + + int32_t Evaluate(int32_t x) const OVERRIDE { + DCHECK(IsUint<1>(x)); + return !x; + } + + int64_t Evaluate(int64_t x ATTRIBUTE_UNUSED) const OVERRIDE { + LOG(FATAL) << DebugName() << " cannot be used with 64-bit values"; + UNREACHABLE(); + } + + DECLARE_INSTRUCTION(BooleanNot); + + private: + DISALLOW_COPY_AND_ASSIGN(HBooleanNot); +}; + class HTypeConversion : public HExpression<1> { public: // Instantiate a type conversion of `input` to `result_type`. |