From: David Brazdil Date: Mon, 8 Feb 2016 14:20:45 +0000 (+0000) Subject: ART: Implement HSelect with CSEL/FCSEL on arm64 X-Git-Tag: android-x86-7.1-r1~408^2~7^2~21^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c0b601b5e4c1add5eefd45f2f4d2c376a20ba4d4;p=android-x86%2Fart.git ART: Implement HSelect with CSEL/FCSEL on arm64 Change-Id: I549af0cba3c5048066a2d1206b78a70b496d349e --- diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index de23fe8ee..435ae5e95 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -2928,30 +2928,128 @@ void InstructionCodeGeneratorARM64::VisitDeoptimize(HDeoptimize* deoptimize) { /* false_target */ nullptr); } -void LocationsBuilderARM64::VisitSelect(HSelect* select) { - LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(select); +enum SelectVariant { + kCsel, + kCselFalseConst, + kCselTrueConst, + kFcsel, +}; + +static inline bool IsConditionOnFloatingPointValues(HInstruction* condition) { + return condition->IsCondition() && + Primitive::IsFloatingPointType(condition->InputAt(0)->GetType()); +} + +static inline bool IsRecognizedCselConstant(HInstruction* constant) { + if (constant->IsConstant()) { + int64_t value = Int64FromConstant(constant->AsConstant()); + if ((value == -1) || (value == 0) || (value == 1)) { + return true; + } + } + return false; +} + +static inline SelectVariant GetSelectVariant(HSelect* select) { if (Primitive::IsFloatingPointType(select->GetType())) { - locations->SetInAt(0, Location::RequiresFpuRegister()); - locations->SetInAt(1, Location::RequiresFpuRegister()); + return kFcsel; + } else if (IsRecognizedCselConstant(select->GetFalseValue())) { + return kCselFalseConst; + } else if (IsRecognizedCselConstant(select->GetTrueValue())) { + return kCselTrueConst; } else { - locations->SetInAt(0, Location::RequiresRegister()); - locations->SetInAt(1, Location::RequiresRegister()); + return kCsel; + } +} + +static inline bool HasSwappedInputs(SelectVariant variant) { + return variant == kCselTrueConst; +} + +static inline Condition GetConditionForSelect(HCondition* condition, SelectVariant variant) { + IfCondition cond = HasSwappedInputs(variant) ? condition->GetOppositeCondition() + : condition->GetCondition(); + return IsConditionOnFloatingPointValues(condition) ? ARM64FPCondition(cond, condition->IsGtBias()) + : ARM64Condition(cond); +} + +void LocationsBuilderARM64::VisitSelect(HSelect* select) { + LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(select); + switch (GetSelectVariant(select)) { + case kCsel: + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetInAt(1, Location::RequiresRegister()); + locations->SetOut(Location::RequiresRegister()); + break; + case kCselFalseConst: + locations->SetInAt(0, Location::ConstantLocation(select->InputAt(0)->AsConstant())); + locations->SetInAt(1, Location::RequiresRegister()); + locations->SetOut(Location::RequiresRegister()); + break; + case kCselTrueConst: + locations->SetInAt(0, Location::RequiresRegister()); + locations->SetInAt(1, Location::ConstantLocation(select->InputAt(1)->AsConstant())); + locations->SetOut(Location::RequiresRegister()); + break; + case kFcsel: + locations->SetInAt(0, Location::RequiresFpuRegister()); + locations->SetInAt(1, Location::RequiresFpuRegister()); + locations->SetOut(Location::RequiresFpuRegister()); + break; } if (IsBooleanValueOrMaterializedCondition(select->GetCondition())) { locations->SetInAt(2, Location::RequiresRegister()); } - locations->SetOut(Location::SameAsFirstInput()); } void InstructionCodeGeneratorARM64::VisitSelect(HSelect* select) { - LocationSummary* locations = select->GetLocations(); - vixl::Label false_target; - GenerateTestAndBranch(select, - /* condition_input_index */ 2, - /* true_target */ nullptr, - &false_target); - codegen_->MoveLocation(locations->Out(), locations->InAt(1), select->GetType()); - __ Bind(&false_target); + HInstruction* cond = select->GetCondition(); + SelectVariant variant = GetSelectVariant(select); + Condition csel_cond; + + if (IsBooleanValueOrMaterializedCondition(cond)) { + if (cond->IsCondition() && cond->GetNext() == select) { + // Condition codes set from previous instruction. + csel_cond = GetConditionForSelect(cond->AsCondition(), variant); + } else { + __ Cmp(InputRegisterAt(select, 2), 0); + csel_cond = HasSwappedInputs(variant) ? eq : ne; + } + } else if (IsConditionOnFloatingPointValues(cond)) { + Location rhs = cond->GetLocations()->InAt(1); + if (rhs.IsConstant()) { + DCHECK(IsFloatingPointZeroConstant(rhs.GetConstant())); + __ Fcmp(InputFPRegisterAt(cond, 0), 0.0); + } else { + __ Fcmp(InputFPRegisterAt(cond, 0), InputFPRegisterAt(cond, 1)); + } + csel_cond = GetConditionForSelect(cond->AsCondition(), variant); + } else { + __ Cmp(InputRegisterAt(cond, 0), InputOperandAt(cond, 1)); + csel_cond = GetConditionForSelect(cond->AsCondition(), variant); + } + + switch (variant) { + case kCsel: + case kCselFalseConst: + __ Csel(OutputRegister(select), + InputRegisterAt(select, 1), + InputOperandAt(select, 0), + csel_cond); + break; + case kCselTrueConst: + __ Csel(OutputRegister(select), + InputRegisterAt(select, 0), + InputOperandAt(select, 1), + csel_cond); + break; + case kFcsel: + __ Fcsel(OutputFPRegister(select), + InputFPRegisterAt(select, 1), + InputFPRegisterAt(select, 0), + csel_cond); + break; + } } void LocationsBuilderARM64::VisitNativeDebugInfo(HNativeDebugInfo* info) { diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 2697af33e..323cfae33 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -5997,9 +5997,14 @@ class HBlocksInLoopReversePostOrderIterator : public ValueObject { }; inline int64_t Int64FromConstant(HConstant* constant) { - DCHECK(constant->IsIntConstant() || constant->IsLongConstant()); - return constant->IsIntConstant() ? constant->AsIntConstant()->GetValue() - : constant->AsLongConstant()->GetValue(); + if (constant->IsIntConstant()) { + return constant->AsIntConstant()->GetValue(); + } else if (constant->IsLongConstant()) { + return constant->AsLongConstant()->GetValue(); + } else { + DCHECK(constant->IsNullConstant()); + return 0; + } } inline bool IsSameDexFile(const DexFile& lhs, const DexFile& rhs) { diff --git a/test/570-checker-select/src/Main.java b/test/570-checker-select/src/Main.java index ec60240e9..8a4cf603a 100644 --- a/test/570-checker-select/src/Main.java +++ b/test/570-checker-select/src/Main.java @@ -19,6 +19,11 @@ public class Main { /// CHECK-START: int Main.BoolCond_IntVarVar(boolean, int, int) register (after) /// CHECK: Select [{{i\d+}},{{i\d+}},{{z\d+}}] + /// CHECK-START-ARM64: int Main.BoolCond_IntVarVar(boolean, int, int) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csel ne + /// CHECK-START-X86_64: int Main.BoolCond_IntVarVar(boolean, int, int) disassembly (after) /// CHECK: <> ParameterValue /// CHECK: Select [{{i\d+}},{{i\d+}},<>] @@ -31,6 +36,11 @@ public class Main { /// CHECK-START: int Main.BoolCond_IntVarCst(boolean, int) register (after) /// CHECK: Select [{{i\d+}},{{i\d+}},{{z\d+}}] + /// CHECK-START-ARM64: int Main.BoolCond_IntVarCst(boolean, int) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csinc ne + /// CHECK-START-X86_64: int Main.BoolCond_IntVarCst(boolean, int) disassembly (after) /// CHECK: <> ParameterValue /// CHECK: Select [{{i\d+}},{{i\d+}},<>] @@ -43,6 +53,11 @@ public class Main { /// CHECK-START: int Main.BoolCond_IntCstVar(boolean, int) register (after) /// CHECK: Select [{{i\d+}},{{i\d+}},{{z\d+}}] + /// CHECK-START-ARM64: int Main.BoolCond_IntCstVar(boolean, int) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csinc eq + /// CHECK-START-X86_64: int Main.BoolCond_IntCstVar(boolean, int) disassembly (after) /// CHECK: <> ParameterValue /// CHECK: Select [{{i\d+}},{{i\d+}},<>] @@ -55,6 +70,11 @@ public class Main { /// CHECK-START: long Main.BoolCond_LongVarVar(boolean, long, long) register (after) /// CHECK: Select [{{j\d+}},{{j\d+}},{{z\d+}}] + /// CHECK-START-ARM64: long Main.BoolCond_LongVarVar(boolean, long, long) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csel ne + /// CHECK-START-X86_64: long Main.BoolCond_LongVarVar(boolean, long, long) disassembly (after) /// CHECK: <> ParameterValue /// CHECK: Select [{{j\d+}},{{j\d+}},<>] @@ -67,6 +87,11 @@ public class Main { /// CHECK-START: long Main.BoolCond_LongVarCst(boolean, long) register (after) /// CHECK: Select [{{j\d+}},{{j\d+}},{{z\d+}}] + /// CHECK-START-ARM64: long Main.BoolCond_LongVarCst(boolean, long) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csinc ne + /// CHECK-START-X86_64: long Main.BoolCond_LongVarCst(boolean, long) disassembly (after) /// CHECK: <> ParameterValue /// CHECK: Select [{{j\d+}},{{j\d+}},<>] @@ -79,6 +104,11 @@ public class Main { /// CHECK-START: long Main.BoolCond_LongCstVar(boolean, long) register (after) /// CHECK: Select [{{j\d+}},{{j\d+}},{{z\d+}}] + /// CHECK-START-ARM64: long Main.BoolCond_LongCstVar(boolean, long) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csinc eq + /// CHECK-START-X86_64: long Main.BoolCond_LongCstVar(boolean, long) disassembly (after) /// CHECK: <> ParameterValue /// CHECK: Select [{{j\d+}},{{j\d+}},<>] @@ -91,6 +121,11 @@ public class Main { /// CHECK-START: float Main.BoolCond_FloatVarVar(boolean, float, float) register (after) /// CHECK: Select [{{f\d+}},{{f\d+}},{{z\d+}}] + /// CHECK-START-ARM64: float Main.BoolCond_FloatVarVar(boolean, float, float) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: fcsel ne + public static float BoolCond_FloatVarVar(boolean cond, float x, float y) { return cond ? x : y; } @@ -98,6 +133,11 @@ public class Main { /// CHECK-START: float Main.BoolCond_FloatVarCst(boolean, float) register (after) /// CHECK: Select [{{f\d+}},{{f\d+}},{{z\d+}}] + /// CHECK-START-ARM64: float Main.BoolCond_FloatVarCst(boolean, float) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: fcsel ne + public static float BoolCond_FloatVarCst(boolean cond, float x) { return cond ? x : 1.0f; } @@ -105,6 +145,11 @@ public class Main { /// CHECK-START: float Main.BoolCond_FloatCstVar(boolean, float) register (after) /// CHECK: Select [{{f\d+}},{{f\d+}},{{z\d+}}] + /// CHECK-START-ARM64: float Main.BoolCond_FloatCstVar(boolean, float) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: fcsel ne + public static float BoolCond_FloatCstVar(boolean cond, float y) { return cond ? 1.0f : y; } @@ -113,6 +158,11 @@ public class Main { /// CHECK: <> LessThanOrEqual [{{i\d+}},{{i\d+}}] /// CHECK-NEXT: Select [{{i\d+}},{{i\d+}},<>] + /// CHECK-START-ARM64: int Main.IntNonmatCond_IntVarVar(int, int, int, int) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csel le + /// CHECK-START-X86_64: int Main.IntNonmatCond_IntVarVar(int, int, int, int) disassembly (after) /// CHECK: <> LessThanOrEqual [{{i\d+}},{{i\d+}}] /// CHECK-NEXT: Select [{{i\d+}},{{i\d+}},<>] @@ -127,6 +177,13 @@ public class Main { /// CHECK-NEXT: <> Select [{{i\d+}},{{i\d+}},{{z\d+}}] /// CHECK-NEXT: Add [<>,<>] + /// CHECK-START-ARM64: int Main.IntMatCond_IntVarVar(int, int, int, int) disassembly (after) + /// CHECK: LessThanOrEqual + /// CHECK-NEXT: cmp + /// CHECK-NEXT: cset le + /// CHECK: Select + /// CHECK-NEXT: csel le + /// CHECK-START-X86_64: int Main.IntMatCond_IntVarVar(int, int, int, int) disassembly (after) /// CHECK: <> LessThanOrEqual [{{i\d+}},{{i\d+}}] /// CHECK: Select [{{i\d+}},{{i\d+}},<>] @@ -141,6 +198,11 @@ public class Main { /// CHECK: <> LessThanOrEqual [{{i\d+}},{{i\d+}}] /// CHECK-NEXT: Select [{{j\d+}},{{j\d+}},<>] + /// CHECK-START-ARM64: long Main.IntNonmatCond_LongVarVar(int, int, long, long) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csel le + /// CHECK-START-X86_64: long Main.IntNonmatCond_LongVarVar(int, int, long, long) disassembly (after) /// CHECK: <> LessThanOrEqual [{{i\d+}},{{i\d+}}] /// CHECK-NEXT: Select [{{j\d+}},{{j\d+}},<>] @@ -156,6 +218,13 @@ public class Main { /// CHECK: <> Select [{{j\d+}},{{j\d+}},<>] /// CHECK: Add [<>,<>] + /// CHECK-START-ARM64: long Main.IntMatCond_LongVarVar(int, int, long, long) disassembly (after) + /// CHECK: LessThanOrEqual + /// CHECK-NEXT: cmp + /// CHECK-NEXT: cset le + /// CHECK: Select + /// CHECK-NEXT: csel le + /// CHECK-START-X86_64: long Main.IntMatCond_LongVarVar(int, int, long, long) disassembly (after) /// CHECK: <> LessThanOrEqual [{{i\d+}},{{i\d+}}] /// CHECK: Select [{{j\d+}},{{j\d+}},<>] @@ -172,6 +241,11 @@ public class Main { /// CHECK: <> LessThanOrEqual [{{j\d+}},{{j\d+}}] /// CHECK: Select [{{j\d+}},{{j\d+}},<>] + /// CHECK-START-ARM64: long Main.LongNonmatCond_LongVarVar(long, long, long, long) disassembly (after) + /// CHECK: Select + /// CHECK-NEXT: cmp + /// CHECK-NEXT: csel le + /// CHECK-START-X86_64: long Main.LongNonmatCond_LongVarVar(long, long, long, long) disassembly (after) /// CHECK: <> LessThanOrEqual [{{j\d+}},{{j\d+}}] /// CHECK: Select [{{j\d+}},{{j\d+}},<>] @@ -187,6 +261,13 @@ public class Main { /// CHECK: <> Select [{{j\d+}},{{j\d+}},<>] /// CHECK: Add [<>,<>] + /// CHECK-START-ARM64: long Main.LongMatCond_LongVarVar(long, long, long, long) disassembly (after) + /// CHECK: LessThanOrEqual + /// CHECK-NEXT: cmp + /// CHECK-NEXT: cset le + /// CHECK: Select + /// CHECK-NEXT: csel le + /// CHECK-START-X86_64: long Main.LongMatCond_LongVarVar(long, long, long, long) disassembly (after) /// CHECK: <> LessThanOrEqual [{{j\d+}},{{j\d+}}] /// CHECK: Select [{{j\d+}},{{j\d+}},<>] @@ -203,6 +284,12 @@ public class Main { /// CHECK: <> LessThanOrEqual [{{f\d+}},{{f\d+}}] /// CHECK-NEXT: Select [{{i\d+}},{{i\d+}},<>] + /// CHECK-START-ARM64: int Main.FloatLtNonmatCond_IntVarVar(float, float, int, int) disassembly (after) + /// CHECK: LessThanOrEqual + /// CHECK: Select + /// CHECK-NEXT: fcmp + /// CHECK-NEXT: csel le + public static int FloatLtNonmatCond_IntVarVar(float a, float b, int x, int y) { return a > b ? x : y; } @@ -211,6 +298,12 @@ public class Main { /// CHECK: <> GreaterThanOrEqual [{{f\d+}},{{f\d+}}] /// CHECK-NEXT: Select [{{i\d+}},{{i\d+}},<>] + /// CHECK-START-ARM64: int Main.FloatGtNonmatCond_IntVarVar(float, float, int, int) disassembly (after) + /// CHECK: GreaterThanOrEqual + /// CHECK: Select + /// CHECK-NEXT: fcmp + /// CHECK-NEXT: csel hs + public static int FloatGtNonmatCond_IntVarVar(float a, float b, int x, int y) { return a < b ? x : y; } @@ -219,6 +312,12 @@ public class Main { /// CHECK: <> GreaterThanOrEqual [{{f\d+}},{{f\d+}}] /// CHECK-NEXT: Select [{{f\d+}},{{f\d+}},<>] + /// CHECK-START-ARM64: float Main.FloatGtNonmatCond_FloatVarVar(float, float, float, float) disassembly (after) + /// CHECK: GreaterThanOrEqual + /// CHECK: Select + /// CHECK-NEXT: fcmp + /// CHECK-NEXT: fcsel hs + public static float FloatGtNonmatCond_FloatVarVar(float a, float b, float x, float y) { return a < b ? x : y; } @@ -228,6 +327,13 @@ public class Main { /// CHECK-NEXT: <> Select [{{i\d+}},{{i\d+}},<>] /// CHECK-NEXT: Add [<>,<>] + /// CHECK-START-ARM64: int Main.FloatLtMatCond_IntVarVar(float, float, int, int) disassembly (after) + /// CHECK: LessThanOrEqual + /// CHECK-NEXT: fcmp + /// CHECK-NEXT: cset le + /// CHECK: Select + /// CHECK-NEXT: csel le + public static int FloatLtMatCond_IntVarVar(float a, float b, int x, int y) { int result = (a > b ? x : y); return result + (a > b ? 0 : 1); @@ -238,6 +344,13 @@ public class Main { /// CHECK-NEXT: <> Select [{{i\d+}},{{i\d+}},<>] /// CHECK-NEXT: Add [<>,<>] + /// CHECK-START-ARM64: int Main.FloatGtMatCond_IntVarVar(float, float, int, int) disassembly (after) + /// CHECK: GreaterThanOrEqual + /// CHECK-NEXT: fcmp + /// CHECK-NEXT: cset hs + /// CHECK: Select + /// CHECK-NEXT: csel hs + public static int FloatGtMatCond_IntVarVar(float a, float b, int x, int y) { int result = (a < b ? x : y); return result + (a < b ? 0 : 1); @@ -248,6 +361,13 @@ public class Main { /// CHECK-NEXT: <> Select [{{f\d+}},{{f\d+}},<>] /// CHECK-NEXT: TypeConversion [<>] + /// CHECK-START-ARM64: float Main.FloatGtMatCond_FloatVarVar(float, float, float, float) disassembly (after) + /// CHECK: GreaterThanOrEqual + /// CHECK-NEXT: fcmp + /// CHECK-NEXT: cset hs + /// CHECK: Select + /// CHECK-NEXT: fcsel hs + public static float FloatGtMatCond_FloatVarVar(float a, float b, float x, float y) { float result = (a < b ? x : y); return result + (a < b ? 0 : 1);