AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimize not() intrinsic.

Browse Source 
This is similar to the intrinsic optimization for any() and all(). Tests
for all three intrinsics have been bulked up a bit as well.

Change-Id: I262b9448e543b4709d1e7c8585f74a206c4b5abd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/406576
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2021-05-10 21:56:10 -04:00 committed by Skia Commit-Bot
parent 7c40b6761a
commit 7bb100ec04
15 changed files with 651 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/sksl/folding/BoolFolding.sksl
View File

@ -14,12 +14,14 @@ bool test() {
const bool TRUE = true; const bool TRUE = true;
const bool FALSE = false; const bool FALSE = false;
bool k = all(bool4(1 == 1, !false, 123 > 12, TRUE)); // all are true bool k = all(bool4(1 == 1, !false, 123 > 12, TRUE)); // all are true
bool l = all(bool3(TRUE, 1 == 2, true)); // three out of four are true bool l = all(bool3(TRUE, 1 == 2, true)); // three out of four are true
bool m = any(bool4(true, 1 == 2, true, TRUE)); // three out of four are true bool m = any(bool4(true, 1 == 2, true, TRUE)); // three out of four are true
bool n = any(bool2(0 == 1, FALSE)); // none are true bool n = any(bool2(0 == 1, FALSE)); // none are true
bool o = any(not(bool2(0 == 1, FALSE))); // all true
bool p = all(not(bool4(1 == 1, !false, 123 > 12, TRUE))); // none are true
return a && !b && c && !d && e && !f && g && !h && i && !j && k && !l && m && !n; return a && !b && c && !d && e && !f && g && !h && i && !j && k && !l && m && !n && o && !p;
} }
half4 main(float2 coords) { half4 main(float2 coords) {

15
resources/sksl/intrinsics/All.sksl
View File

@ -1 +1,14 @@
bool4 a; void main() { sk_FragColor.x = all(a) ? 1 : 0; } uniform half4 inputH4, expectedH4;
uniform half4 colorGreen, colorRed;
half4 main(float2 coords) {
bool4 input = bool4(inputH4);
bool4 expected = bool4(expectedH4);
const bool4 constVal = bool4(true, true, false, true);
return (all(input.xy) == expected.x &&
all(input.xyz) == expected.y &&
all(input.xyzw) == expected.z &&
all(constVal.xy) == expected.x &&
all(constVal.xyz) == expected.y &&
all(constVal.xyzw) == expected.z) ? colorGreen : colorRed;
}

15
resources/sksl/intrinsics/Any.sksl
View File

@ -1 +1,14 @@
bool4 a; void main() { sk_FragColor.x = any(a) ? 1 : 0; } uniform half4 inputH4, expectedH4;
uniform half4 colorGreen, colorRed;
half4 main(float2 coords) {
bool4 input = bool4(inputH4);
bool4 expected = bool4(expectedH4);
const bool4 constVal = bool4(false, false, true, false);
return (any(input.xy) == expected.x &&
any(input.xyz) == expected.y &&
any(input.xyzw) == expected.z &&
any(constVal.xy) == expected.x &&
any(constVal.xyz) == expected.y &&
any(constVal.xyzw) == expected.z) ? colorGreen : colorRed;
}

15
resources/sksl/intrinsics/Not.sksl
View File

@ -1 +1,14 @@
bool4 a; void main() { sk_FragColor.x = not(a).x ? 1 : 0; } uniform half4 inputH4, expectedH4;
uniform half4 colorGreen, colorRed;
half4 main(float2 coords) {
bool4 input = bool4(inputH4);
bool4 expected = bool4(expectedH4);
const bool4 constVal = bool4(true, false, true, false);
return (not(input.xy) == expected.xy &&
not(input.xyz) == expected.xyz &&
not(input.xyzw) == expected.xyzw &&
not(constVal.xy) == expected.xy &&
not(constVal.xyz) == expected.xyz &&
not(constVal.xyzw) == expected.xyzw) ? colorGreen : colorRed;
}

32
src/sksl/ir/SkSLFunctionCall.cpp
View File

@ -99,7 +99,7 @@ static std::unique_ptr<Expression> evaluate_intrinsic_1_of_type(const Context& c
const FN& evaluate) { const FN& evaluate) {
const Type& vecType = arg->type(); const Type& vecType = arg->type();
const Type& type = vecType.componentType(); const Type& type = vecType.componentType();
SkASSERT(type.isNumber()); SkASSERT(type.isScalar());
ExpressionArray result; ExpressionArray result;
result.reserve_back(vecType.columns()); result.reserve_back(vecType.columns());
@ -114,8 +114,10 @@ static std::unique_ptr<Expression> evaluate_intrinsic_1_of_type(const Context& c
return ConstructorCompound::Make(context, arg->fOffset, vecType, std::move(result)); return ConstructorCompound::Make(context, arg->fOffset, vecType, std::move(result));
} }
template <typename FN,
template <typename FN, bool kSupportsFloat = true, bool kSupportsInt = true> bool kSupportsFloat = true,
bool kSupportsInt = true,
bool kSupportsBool = false>
static std::unique_ptr<Expression> evaluate_intrinsic_generic1(const Context& context, static std::unique_ptr<Expression> evaluate_intrinsic_generic1(const Context& context,
const ExpressionArray& arguments, const ExpressionArray& arguments,
const FN& evaluate) { const FN& evaluate) {
@ -133,6 +135,11 @@ static std::unique_ptr<Expression> evaluate_intrinsic_generic1(const Context& co
return evaluate_intrinsic_1_of_type<IntLiteral>(context, arg, evaluate); return evaluate_intrinsic_1_of_type<IntLiteral>(context, arg, evaluate);
} }
} }
if constexpr (kSupportsBool) {
if (type.isBoolean()) {
return evaluate_intrinsic_1_of_type<BoolLiteral>(context, arg, evaluate);
}
}
SkDEBUGFAILF("unsupported type %s", type.description().c_str()); SkDEBUGFAILF("unsupported type %s", type.description().c_str());
return nullptr; return nullptr;
} }
@ -141,8 +148,20 @@ template <typename FN>
static std::unique_ptr<Expression> evaluate_intrinsic_float1(const Context& context, static std::unique_ptr<Expression> evaluate_intrinsic_float1(const Context& context,
const ExpressionArray& arguments, const ExpressionArray& arguments,
const FN& evaluate) { const FN& evaluate) {
return evaluate_intrinsic_generic1<FN, /*kSupportsFloat=*/true, /*kSupportsInt=*/false>( return evaluate_intrinsic_generic1<FN,
context, arguments, evaluate); /*kSupportsFloat=*/true,
/*kSupportsInt=*/false,
/*kSupportsBool=*/false>(context, arguments, evaluate);
}
template <typename FN>
static std::unique_ptr<Expression> evaluate_intrinsic_bool1(const Context& context,
const ExpressionArray& arguments,
const FN& evaluate) {
return evaluate_intrinsic_generic1<FN,
/*kSupportsFloat=*/false,
/*kSupportsInt=*/false,
/*kSupportsBool=*/true>(context, arguments, evaluate);
} }
static std::unique_ptr<Expression> optimize_intrinsic_call(const Context& context, static std::unique_ptr<Expression> optimize_intrinsic_call(const Context& context,
@ -155,6 +174,9 @@ static std::unique_ptr<Expression> optimize_intrinsic_call(const Context& contex
case k_any_IntrinsicKind: case k_any_IntrinsicKind:
return coalesce_bool_vector(arguments, /*startingState=*/false, return coalesce_bool_vector(arguments, /*startingState=*/false,
[](bool a, bool b) { return a || b; }); [](bool a, bool b) { return a || b; });
case k_not_IntrinsicKind:
return evaluate_intrinsic_bool1(context, arguments, [](bool a) { return !a; });
case k_greaterThan_IntrinsicKind: case k_greaterThan_IntrinsicKind:
return optimize_comparison(context, arguments, [](auto a, auto b) { return a > b; }); return optimize_comparison(context, arguments, [](auto a, auto b) { return a > b; });

4
tests/sksl/folding/BoolFolding.glsl
View File

@ -17,5 +17,7 @@ vec4 main() {
bool _13_l = false; bool _13_l = false;
bool _14_m = true; bool _14_m = true;
bool _15_n = false; bool _15_n = false;
return ((((((((((((_0_a && !_1_b) && _2_c) && !_3_d) && _4_e) && !_5_f) && _6_g) && !_7_h) && _8_i) && !_9_j) && _12_k) && !_13_l) && _14_m) && !_15_n ? colorGreen : colorRed; bool _16_o = true;
bool _17_p = false;
return ((((((((((((((_0_a && !_1_b) && _2_c) && !_3_d) && _4_e) && !_5_f) && _6_g) && !_7_h) && _8_i) && !_9_j) && _12_k) && !_13_l) && _14_m) && !_15_n) && _16_o) && !_17_p ? colorGreen : colorRed;
} }

188
tests/sksl/intrinsics/All.asm.frag
View File

@ -1,18 +1,56 @@
OpCapability Shader OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450" %1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450 OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
OpExecutionMode %main OriginUpperLeft OpExecutionMode %_entrypoint_v OriginUpperLeft
OpName %sk_FragColor "sk_FragColor" OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise" OpName %sk_Clockwise "sk_Clockwise"
OpName %a "a" OpName %_UniformBuffer "_UniformBuffer"
OpMemberName %_UniformBuffer 0 "inputH4"
OpMemberName %_UniformBuffer 1 "expectedH4"
OpMemberName %_UniformBuffer 2 "colorGreen"
OpMemberName %_UniformBuffer 3 "colorRed"
OpName %_entrypoint_v "_entrypoint_v"
OpName %main "main" OpName %main "main"
OpName %input "input"
OpName %expected "expected"
OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0 OpDecorate %sk_FragColor Location 0
OpDecorate %sk_FragColor Index 0 OpDecorate %sk_FragColor Index 0
OpDecorate %sk_Clockwise BuiltIn FrontFacing OpDecorate %sk_Clockwise BuiltIn FrontFacing
OpDecorate %17 RelaxedPrecision OpMemberDecorate %_UniformBuffer 0 Offset 0
OpDecorate %22 RelaxedPrecision OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 1 Offset 16
OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 2 Offset 32
OpMemberDecorate %_UniformBuffer 2 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 3 Offset 48
OpMemberDecorate %_UniformBuffer 3 RelaxedPrecision
OpDecorate %_UniformBuffer Block
OpDecorate %10 Binding 0
OpDecorate %10 DescriptorSet 0
OpDecorate %33 RelaxedPrecision
OpDecorate %34 RelaxedPrecision
OpDecorate %36 RelaxedPrecision
OpDecorate %38 RelaxedPrecision
OpDecorate %40 RelaxedPrecision
OpDecorate %46 RelaxedPrecision
OpDecorate %47 RelaxedPrecision
OpDecorate %49 RelaxedPrecision
OpDecorate %51 RelaxedPrecision
OpDecorate %53 RelaxedPrecision
OpDecorate %58 RelaxedPrecision
OpDecorate %61 RelaxedPrecision
OpDecorate %67 RelaxedPrecision
OpDecorate %70 RelaxedPrecision
OpDecorate %77 RelaxedPrecision
OpDecorate %78 RelaxedPrecision
OpDecorate %84 RelaxedPrecision
OpDecorate %89 RelaxedPrecision
OpDecorate %95 RelaxedPrecision
OpDecorate %106 RelaxedPrecision
OpDecorate %109 RelaxedPrecision
OpDecorate %110 RelaxedPrecision
%float = OpTypeFloat 32 %float = OpTypeFloat 32
%v4float = OpTypeVector %float 4 %v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float %_ptr_Output_v4float = OpTypePointer Output %v4float
@ -20,22 +58,134 @@ OpDecorate %22 RelaxedPrecision
%bool = OpTypeBool %bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool %_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input %sk_Clockwise = OpVariable %_ptr_Input_bool Input
%v4bool = OpTypeVector %bool 4 %_UniformBuffer = OpTypeStruct %v4float %v4float %v4float %v4float
%_ptr_Private_v4bool = OpTypePointer Private %v4bool %_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
%a = OpVariable %_ptr_Private_v4bool Private %10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
%void = OpTypeVoid %void = OpTypeVoid
%14 = OpTypeFunction %void %15 = OpTypeFunction %void
%v2float = OpTypeVector %float 2
%float_0 = OpConstant %float 0
%19 = OpConstantComposite %v2float %float_0 %float_0
%_ptr_Function_v2float = OpTypePointer Function %v2float
%23 = OpTypeFunction %v4float %_ptr_Function_v2float
%v4bool = OpTypeVector %bool 4
%_ptr_Function_v4bool = OpTypePointer Function %v4bool
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%int = OpTypeInt 32 1 %int = OpTypeInt 32 1
%int_1 = OpConstant %int 1
%int_0 = OpConstant %int 0 %int_0 = OpConstant %int 0
%_ptr_Output_float = OpTypePointer Output %float %int_1 = OpConstant %int 1
%main = OpFunction %void None %14 %false = OpConstantFalse %bool
%15 = OpLabel %v2bool = OpTypeVector %bool 2
%17 = OpLoad %v4bool %a %v3bool = OpTypeVector %bool 3
%16 = OpAll %bool %17 %_ptr_Function_v4float = OpTypePointer Function %v4float
%18 = OpSelect %int %16 %int_1 %int_0 %int_2 = OpConstant %int 2
%22 = OpConvertSToF %float %18 %int_3 = OpConstant %int 3
%23 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_0 %_entrypoint_v = OpFunction %void None %15
OpStore %23 %22 %16 = OpLabel
%20 = OpVariable %_ptr_Function_v2float Function
OpStore %20 %19
%22 = OpFunctionCall %v4float %main %20
OpStore %sk_FragColor %22
OpReturn OpReturn
OpFunctionEnd OpFunctionEnd
%main = OpFunction %v4float None %23
%24 = OpFunctionParameter %_ptr_Function_v2float
%25 = OpLabel
%input = OpVariable %_ptr_Function_v4bool Function
%expected = OpVariable %_ptr_Function_v4bool Function
%99 = OpVariable %_ptr_Function_v4float Function
%29 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%33 = OpLoad %v4float %29
%34 = OpCompositeExtract %float %33 0
%35 = OpFUnordNotEqual %bool %34 %float_0
%36 = OpCompositeExtract %float %33 1
%37 = OpFUnordNotEqual %bool %36 %float_0
%38 = OpCompositeExtract %float %33 2
%39 = OpFUnordNotEqual %bool %38 %float_0
%40 = OpCompositeExtract %float %33 3
%41 = OpFUnordNotEqual %bool %40 %float_0
%42 = OpCompositeConstruct %v4bool %35 %37 %39 %41
OpStore %input %42
%44 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%46 = OpLoad %v4float %44
%47 = OpCompositeExtract %float %46 0
%48 = OpFUnordNotEqual %bool %47 %float_0
%49 = OpCompositeExtract %float %46 1
%50 = OpFUnordNotEqual %bool %49 %float_0
%51 = OpCompositeExtract %float %46 2
%52 = OpFUnordNotEqual %bool %51 %float_0
%53 = OpCompositeExtract %float %46 3
%54 = OpFUnordNotEqual %bool %53 %float_0
%55 = OpCompositeConstruct %v4bool %48 %50 %52 %54
OpStore %expected %55
%58 = OpLoad %v4bool %input
%59 = OpVectorShuffle %v2bool %58 %58 0 1
%57 = OpAll %bool %59
%61 = OpLoad %v4bool %expected
%62 = OpCompositeExtract %bool %61 0
%63 = OpLogicalEqual %bool %57 %62
OpSelectionMerge %65 None
OpBranchConditional %63 %64 %65
%64 = OpLabel
%67 = OpLoad %v4bool %input
%68 = OpVectorShuffle %v3bool %67 %67 0 1 2
%66 = OpAll %bool %68
%70 = OpLoad %v4bool %expected
%71 = OpCompositeExtract %bool %70 1
%72 = OpLogicalEqual %bool %66 %71
OpBranch %65
%65 = OpLabel
%73 = OpPhi %bool %false %25 %72 %64
OpSelectionMerge %75 None
OpBranchConditional %73 %74 %75
%74 = OpLabel
%77 = OpLoad %v4bool %input
%76 = OpAll %bool %77
%78 = OpLoad %v4bool %expected
%79 = OpCompositeExtract %bool %78 2
%80 = OpLogicalEqual %bool %76 %79
OpBranch %75
%75 = OpLabel
%81 = OpPhi %bool %false %65 %80 %74
OpSelectionMerge %83 None
OpBranchConditional %81 %82 %83
%82 = OpLabel
%84 = OpLoad %v4bool %expected
%85 = OpCompositeExtract %bool %84 0
OpBranch %83
%83 = OpLabel
%86 = OpPhi %bool %false %75 %85 %82
OpSelectionMerge %88 None
OpBranchConditional %86 %87 %88
%87 = OpLabel
%89 = OpLoad %v4bool %expected
%90 = OpCompositeExtract %bool %89 1
%91 = OpLogicalEqual %bool %false %90
OpBranch %88
%88 = OpLabel
%92 = OpPhi %bool %false %83 %91 %87
OpSelectionMerge %94 None
OpBranchConditional %92 %93 %94
%93 = OpLabel
%95 = OpLoad %v4bool %expected
%96 = OpCompositeExtract %bool %95 2
%97 = OpLogicalEqual %bool %false %96
OpBranch %94
%94 = OpLabel
%98 = OpPhi %bool %false %88 %97 %93
OpSelectionMerge %103 None
OpBranchConditional %98 %101 %102
%101 = OpLabel
%104 = OpAccessChain %_ptr_Uniform_v4float %10 %int_2
%106 = OpLoad %v4float %104
OpStore %99 %106
OpBranch %103
%102 = OpLabel
%107 = OpAccessChain %_ptr_Uniform_v4float %10 %int_3
%109 = OpLoad %v4float %107
OpStore %99 %109
OpBranch %103
%103 = OpLabel
%110 = OpLoad %v4float %99
OpReturnValue %110
OpFunctionEnd

11
tests/sksl/intrinsics/All.glsl
View File

@ -1,6 +1,11 @@
out vec4 sk_FragColor; out vec4 sk_FragColor;
bvec4 a; uniform vec4 inputH4;
void main() { uniform vec4 expectedH4;
sk_FragColor.x = float(all(a) ? 1 : 0); uniform vec4 colorGreen;
uniform vec4 colorRed;
vec4 main() {
bvec4 input = bvec4(inputH4);
bvec4 expected = bvec4(expectedH4);
return ((((all(input.xy) == expected.x && all(input.xyz) == expected.y) && all(input) == expected.z) && expected.x) && false == expected.y) && false == expected.z ? colorGreen : colorRed;
} }

18
tests/sksl/intrinsics/All.metal
View File

@ -1,19 +1,23 @@
#include <metal_stdlib> #include <metal_stdlib>
#include <simd/simd.h> #include <simd/simd.h>
using namespace metal; using namespace metal;
struct Uniforms {
float4 inputH4;
float4 expectedH4;
float4 colorGreen;
float4 colorRed;
};
struct Inputs { struct Inputs {
}; };
struct Outputs { struct Outputs {
float4 sk_FragColor [[color(0)]]; float4 sk_FragColor [[color(0)]];
}; };
struct Globals {
bool4 a; fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
};
fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Globals _globals{{}};
(void)_globals;
Outputs _out; Outputs _out;
(void)_out; (void)_out;
_out.sk_FragColor.x = float(all(_globals.a) ? 1 : 0); bool4 input = bool4(_uniforms.inputH4);
bool4 expected = bool4(_uniforms.expectedH4);
_out.sk_FragColor = ((((all(input.xy) == expected.x && all(input.xyz) == expected.y) && all(input) == expected.z) && expected.x) && false == expected.y) && false == expected.z ? _uniforms.colorGreen : _uniforms.colorRed;
return _out; return _out;
} }

187
tests/sksl/intrinsics/Any.asm.frag
View File

@ -1,18 +1,56 @@
OpCapability Shader OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450" %1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450 OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
OpExecutionMode %main OriginUpperLeft OpExecutionMode %_entrypoint_v OriginUpperLeft
OpName %sk_FragColor "sk_FragColor" OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise" OpName %sk_Clockwise "sk_Clockwise"
OpName %a "a" OpName %_UniformBuffer "_UniformBuffer"
OpMemberName %_UniformBuffer 0 "inputH4"
OpMemberName %_UniformBuffer 1 "expectedH4"
OpMemberName %_UniformBuffer 2 "colorGreen"
OpMemberName %_UniformBuffer 3 "colorRed"
OpName %_entrypoint_v "_entrypoint_v"
OpName %main "main" OpName %main "main"
OpName %input "input"
OpName %expected "expected"
OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0 OpDecorate %sk_FragColor Location 0
OpDecorate %sk_FragColor Index 0 OpDecorate %sk_FragColor Index 0
OpDecorate %sk_Clockwise BuiltIn FrontFacing OpDecorate %sk_Clockwise BuiltIn FrontFacing
OpDecorate %17 RelaxedPrecision OpMemberDecorate %_UniformBuffer 0 Offset 0
OpDecorate %22 RelaxedPrecision OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 1 Offset 16
OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 2 Offset 32
OpMemberDecorate %_UniformBuffer 2 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 3 Offset 48
OpMemberDecorate %_UniformBuffer 3 RelaxedPrecision
OpDecorate %_UniformBuffer Block
OpDecorate %10 Binding 0
OpDecorate %10 DescriptorSet 0
OpDecorate %33 RelaxedPrecision
OpDecorate %34 RelaxedPrecision
OpDecorate %36 RelaxedPrecision
OpDecorate %38 RelaxedPrecision
OpDecorate %40 RelaxedPrecision
OpDecorate %46 RelaxedPrecision
OpDecorate %47 RelaxedPrecision
OpDecorate %49 RelaxedPrecision
OpDecorate %51 RelaxedPrecision
OpDecorate %53 RelaxedPrecision
OpDecorate %58 RelaxedPrecision
OpDecorate %61 RelaxedPrecision
OpDecorate %67 RelaxedPrecision
OpDecorate %70 RelaxedPrecision
OpDecorate %77 RelaxedPrecision
OpDecorate %78 RelaxedPrecision
OpDecorate %84 RelaxedPrecision
OpDecorate %90 RelaxedPrecision
OpDecorate %95 RelaxedPrecision
OpDecorate %105 RelaxedPrecision
OpDecorate %108 RelaxedPrecision
OpDecorate %109 RelaxedPrecision
%float = OpTypeFloat 32 %float = OpTypeFloat 32
%v4float = OpTypeVector %float 4 %v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float %_ptr_Output_v4float = OpTypePointer Output %v4float
@ -20,22 +58,133 @@ OpDecorate %22 RelaxedPrecision
%bool = OpTypeBool %bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool %_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input %sk_Clockwise = OpVariable %_ptr_Input_bool Input
%v4bool = OpTypeVector %bool 4 %_UniformBuffer = OpTypeStruct %v4float %v4float %v4float %v4float
%_ptr_Private_v4bool = OpTypePointer Private %v4bool %_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
%a = OpVariable %_ptr_Private_v4bool Private %10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
%void = OpTypeVoid %void = OpTypeVoid
%14 = OpTypeFunction %void %15 = OpTypeFunction %void
%v2float = OpTypeVector %float 2
%float_0 = OpConstant %float 0
%19 = OpConstantComposite %v2float %float_0 %float_0
%_ptr_Function_v2float = OpTypePointer Function %v2float
%23 = OpTypeFunction %v4float %_ptr_Function_v2float
%v4bool = OpTypeVector %bool 4
%_ptr_Function_v4bool = OpTypePointer Function %v4bool
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%int = OpTypeInt 32 1 %int = OpTypeInt 32 1
%int_1 = OpConstant %int 1
%int_0 = OpConstant %int 0 %int_0 = OpConstant %int 0
%_ptr_Output_float = OpTypePointer Output %float %int_1 = OpConstant %int 1
%main = OpFunction %void None %14 %false = OpConstantFalse %bool
%15 = OpLabel %v2bool = OpTypeVector %bool 2
%17 = OpLoad %v4bool %a %v3bool = OpTypeVector %bool 3
%16 = OpAny %bool %17 %_ptr_Function_v4float = OpTypePointer Function %v4float
%18 = OpSelect %int %16 %int_1 %int_0 %int_2 = OpConstant %int 2
%22 = OpConvertSToF %float %18 %int_3 = OpConstant %int 3
%23 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_0 %_entrypoint_v = OpFunction %void None %15
OpStore %23 %22 %16 = OpLabel
%20 = OpVariable %_ptr_Function_v2float Function
OpStore %20 %19
%22 = OpFunctionCall %v4float %main %20
OpStore %sk_FragColor %22
OpReturn OpReturn
OpFunctionEnd OpFunctionEnd
%main = OpFunction %v4float None %23
%24 = OpFunctionParameter %_ptr_Function_v2float
%25 = OpLabel
%input = OpVariable %_ptr_Function_v4bool Function
%expected = OpVariable %_ptr_Function_v4bool Function
%98 = OpVariable %_ptr_Function_v4float Function
%29 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%33 = OpLoad %v4float %29
%34 = OpCompositeExtract %float %33 0
%35 = OpFUnordNotEqual %bool %34 %float_0
%36 = OpCompositeExtract %float %33 1
%37 = OpFUnordNotEqual %bool %36 %float_0
%38 = OpCompositeExtract %float %33 2
%39 = OpFUnordNotEqual %bool %38 %float_0
%40 = OpCompositeExtract %float %33 3
%41 = OpFUnordNotEqual %bool %40 %float_0
%42 = OpCompositeConstruct %v4bool %35 %37 %39 %41
OpStore %input %42
%44 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%46 = OpLoad %v4float %44
%47 = OpCompositeExtract %float %46 0
%48 = OpFUnordNotEqual %bool %47 %float_0
%49 = OpCompositeExtract %float %46 1
%50 = OpFUnordNotEqual %bool %49 %float_0
%51 = OpCompositeExtract %float %46 2
%52 = OpFUnordNotEqual %bool %51 %float_0
%53 = OpCompositeExtract %float %46 3
%54 = OpFUnordNotEqual %bool %53 %float_0
%55 = OpCompositeConstruct %v4bool %48 %50 %52 %54
OpStore %expected %55
%58 = OpLoad %v4bool %input
%59 = OpVectorShuffle %v2bool %58 %58 0 1
%57 = OpAny %bool %59
%61 = OpLoad %v4bool %expected
%62 = OpCompositeExtract %bool %61 0
%63 = OpLogicalEqual %bool %57 %62
OpSelectionMerge %65 None
OpBranchConditional %63 %64 %65
%64 = OpLabel
%67 = OpLoad %v4bool %input
%68 = OpVectorShuffle %v3bool %67 %67 0 1 2
%66 = OpAny %bool %68
%70 = OpLoad %v4bool %expected
%71 = OpCompositeExtract %bool %70 1
%72 = OpLogicalEqual %bool %66 %71
OpBranch %65
%65 = OpLabel
%73 = OpPhi %bool %false %25 %72 %64
OpSelectionMerge %75 None
OpBranchConditional %73 %74 %75
%74 = OpLabel
%77 = OpLoad %v4bool %input
%76 = OpAny %bool %77
%78 = OpLoad %v4bool %expected
%79 = OpCompositeExtract %bool %78 2
%80 = OpLogicalEqual %bool %76 %79
OpBranch %75
%75 = OpLabel
%81 = OpPhi %bool %false %65 %80 %74
OpSelectionMerge %83 None
OpBranchConditional %81 %82 %83
%82 = OpLabel
%84 = OpLoad %v4bool %expected
%85 = OpCompositeExtract %bool %84 0
%86 = OpLogicalEqual %bool %false %85
OpBranch %83
%83 = OpLabel
%87 = OpPhi %bool %false %75 %86 %82
OpSelectionMerge %89 None
OpBranchConditional %87 %88 %89
%88 = OpLabel
%90 = OpLoad %v4bool %expected
%91 = OpCompositeExtract %bool %90 1
OpBranch %89
%89 = OpLabel
%92 = OpPhi %bool %false %83 %91 %88
OpSelectionMerge %94 None
OpBranchConditional %92 %93 %94
%93 = OpLabel
%95 = OpLoad %v4bool %expected
%96 = OpCompositeExtract %bool %95 2
OpBranch %94
%94 = OpLabel
%97 = OpPhi %bool %false %89 %96 %93
OpSelectionMerge %102 None
OpBranchConditional %97 %100 %101
%100 = OpLabel
%103 = OpAccessChain %_ptr_Uniform_v4float %10 %int_2
%105 = OpLoad %v4float %103
OpStore %98 %105
OpBranch %102
%101 = OpLabel
%106 = OpAccessChain %_ptr_Uniform_v4float %10 %int_3
%108 = OpLoad %v4float %106
OpStore %98 %108
OpBranch %102
%102 = OpLabel
%109 = OpLoad %v4float %98
OpReturnValue %109
OpFunctionEnd

11
tests/sksl/intrinsics/Any.glsl
View File

@ -1,6 +1,11 @@
out vec4 sk_FragColor; out vec4 sk_FragColor;
bvec4 a; uniform vec4 inputH4;
void main() { uniform vec4 expectedH4;
sk_FragColor.x = float(any(a) ? 1 : 0); uniform vec4 colorGreen;
uniform vec4 colorRed;
vec4 main() {
bvec4 input = bvec4(inputH4);
bvec4 expected = bvec4(expectedH4);
return ((((any(input.xy) == expected.x && any(input.xyz) == expected.y) && any(input) == expected.z) && false == expected.x) && expected.y) && expected.z ? colorGreen : colorRed;
} }

18
tests/sksl/intrinsics/Any.metal
View File

@ -1,19 +1,23 @@
#include <metal_stdlib> #include <metal_stdlib>
#include <simd/simd.h> #include <simd/simd.h>
using namespace metal; using namespace metal;
struct Uniforms {
float4 inputH4;
float4 expectedH4;
float4 colorGreen;
float4 colorRed;
};
struct Inputs { struct Inputs {
}; };
struct Outputs { struct Outputs {
float4 sk_FragColor [[color(0)]]; float4 sk_FragColor [[color(0)]];
}; };
struct Globals {
bool4 a; fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
};
fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Globals _globals{{}};
(void)_globals;
Outputs _out; Outputs _out;
(void)_out; (void)_out;
_out.sk_FragColor.x = float(any(_globals.a) ? 1 : 0); bool4 input = bool4(_uniforms.inputH4);
bool4 expected = bool4(_uniforms.expectedH4);
_out.sk_FragColor = ((((any(input.xy) == expected.x && any(input.xyz) == expected.y) && any(input) == expected.z) && false == expected.x) && expected.y) && expected.z ? _uniforms.colorGreen : _uniforms.colorRed;
return _out; return _out;
} }

198
tests/sksl/intrinsics/Not.asm.frag
View File

@ -1,18 +1,56 @@
OpCapability Shader OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450" %1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450 OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %sk_FragColor %sk_Clockwise OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
OpExecutionMode %main OriginUpperLeft OpExecutionMode %_entrypoint_v OriginUpperLeft
OpName %sk_FragColor "sk_FragColor" OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise" OpName %sk_Clockwise "sk_Clockwise"
OpName %a "a" OpName %_UniformBuffer "_UniformBuffer"
OpMemberName %_UniformBuffer 0 "inputH4"
OpMemberName %_UniformBuffer 1 "expectedH4"
OpMemberName %_UniformBuffer 2 "colorGreen"
OpMemberName %_UniformBuffer 3 "colorRed"
OpName %_entrypoint_v "_entrypoint_v"
OpName %main "main" OpName %main "main"
OpName %input "input"
OpName %expected "expected"
OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor RelaxedPrecision
OpDecorate %sk_FragColor Location 0 OpDecorate %sk_FragColor Location 0
OpDecorate %sk_FragColor Index 0 OpDecorate %sk_FragColor Index 0
OpDecorate %sk_Clockwise BuiltIn FrontFacing OpDecorate %sk_Clockwise BuiltIn FrontFacing
OpDecorate %17 RelaxedPrecision OpMemberDecorate %_UniformBuffer 0 Offset 0
OpDecorate %23 RelaxedPrecision OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 1 Offset 16
OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 2 Offset 32
OpMemberDecorate %_UniformBuffer 2 RelaxedPrecision
OpMemberDecorate %_UniformBuffer 3 Offset 48
OpMemberDecorate %_UniformBuffer 3 RelaxedPrecision
OpDecorate %_UniformBuffer Block
OpDecorate %10 Binding 0
OpDecorate %10 DescriptorSet 0
OpDecorate %33 RelaxedPrecision
OpDecorate %34 RelaxedPrecision
OpDecorate %36 RelaxedPrecision
OpDecorate %38 RelaxedPrecision
OpDecorate %40 RelaxedPrecision
OpDecorate %46 RelaxedPrecision
OpDecorate %47 RelaxedPrecision
OpDecorate %49 RelaxedPrecision
OpDecorate %51 RelaxedPrecision
OpDecorate %53 RelaxedPrecision
OpDecorate %58 RelaxedPrecision
OpDecorate %61 RelaxedPrecision
OpDecorate %68 RelaxedPrecision
OpDecorate %71 RelaxedPrecision
OpDecorate %79 RelaxedPrecision
OpDecorate %80 RelaxedPrecision
OpDecorate %88 RelaxedPrecision
OpDecorate %96 RelaxedPrecision
OpDecorate %104 RelaxedPrecision
OpDecorate %115 RelaxedPrecision
OpDecorate %118 RelaxedPrecision
OpDecorate %119 RelaxedPrecision
%float = OpTypeFloat 32 %float = OpTypeFloat 32
%v4float = OpTypeVector %float 4 %v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float %_ptr_Output_v4float = OpTypePointer Output %v4float
@ -20,23 +58,143 @@ OpDecorate %23 RelaxedPrecision
%bool = OpTypeBool %bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool %_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input %sk_Clockwise = OpVariable %_ptr_Input_bool Input
%v4bool = OpTypeVector %bool 4 %_UniformBuffer = OpTypeStruct %v4float %v4float %v4float %v4float
%_ptr_Private_v4bool = OpTypePointer Private %v4bool %_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
%a = OpVariable %_ptr_Private_v4bool Private %10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
%void = OpTypeVoid %void = OpTypeVoid
%14 = OpTypeFunction %void %15 = OpTypeFunction %void
%v2float = OpTypeVector %float 2
%float_0 = OpConstant %float 0
%19 = OpConstantComposite %v2float %float_0 %float_0
%_ptr_Function_v2float = OpTypePointer Function %v2float
%23 = OpTypeFunction %v4float %_ptr_Function_v2float
%v4bool = OpTypeVector %bool 4
%_ptr_Function_v4bool = OpTypePointer Function %v4bool
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%int = OpTypeInt 32 1 %int = OpTypeInt 32 1
%int_1 = OpConstant %int 1
%int_0 = OpConstant %int 0 %int_0 = OpConstant %int 0
%_ptr_Output_float = OpTypePointer Output %float %int_1 = OpConstant %int 1
%main = OpFunction %void None %14 %false = OpConstantFalse %bool
%15 = OpLabel %v2bool = OpTypeVector %bool 2
%17 = OpLoad %v4bool %a %v3bool = OpTypeVector %bool 3
%16 = OpLogicalNot %v4bool %17 %true = OpConstantTrue %bool
%18 = OpCompositeExtract %bool %16 0 %87 = OpConstantComposite %v2bool %false %true
%19 = OpSelect %int %18 %int_1 %int_0 %95 = OpConstantComposite %v3bool %false %true %false
%23 = OpConvertSToF %float %19 %103 = OpConstantComposite %v4bool %false %true %false %true
%24 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_0 %_ptr_Function_v4float = OpTypePointer Function %v4float
OpStore %24 %23 %int_2 = OpConstant %int 2
%int_3 = OpConstant %int 3
%_entrypoint_v = OpFunction %void None %15
%16 = OpLabel
%20 = OpVariable %_ptr_Function_v2float Function
OpStore %20 %19
%22 = OpFunctionCall %v4float %main %20
OpStore %sk_FragColor %22
OpReturn OpReturn
OpFunctionEnd OpFunctionEnd
%main = OpFunction %v4float None %23
%24 = OpFunctionParameter %_ptr_Function_v2float
%25 = OpLabel
%input = OpVariable %_ptr_Function_v4bool Function
%expected = OpVariable %_ptr_Function_v4bool Function
%108 = OpVariable %_ptr_Function_v4float Function
%29 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
%33 = OpLoad %v4float %29
%34 = OpCompositeExtract %float %33 0
%35 = OpFUnordNotEqual %bool %34 %float_0
%36 = OpCompositeExtract %float %33 1
%37 = OpFUnordNotEqual %bool %36 %float_0
%38 = OpCompositeExtract %float %33 2
%39 = OpFUnordNotEqual %bool %38 %float_0
%40 = OpCompositeExtract %float %33 3
%41 = OpFUnordNotEqual %bool %40 %float_0
%42 = OpCompositeConstruct %v4bool %35 %37 %39 %41
OpStore %input %42
%44 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
%46 = OpLoad %v4float %44
%47 = OpCompositeExtract %float %46 0
%48 = OpFUnordNotEqual %bool %47 %float_0
%49 = OpCompositeExtract %float %46 1
%50 = OpFUnordNotEqual %bool %49 %float_0
%51 = OpCompositeExtract %float %46 2
%52 = OpFUnordNotEqual %bool %51 %float_0
%53 = OpCompositeExtract %float %46 3
%54 = OpFUnordNotEqual %bool %53 %float_0
%55 = OpCompositeConstruct %v4bool %48 %50 %52 %54
OpStore %expected %55
%58 = OpLoad %v4bool %input
%59 = OpVectorShuffle %v2bool %58 %58 0 1
%57 = OpLogicalNot %v2bool %59
%61 = OpLoad %v4bool %expected
%62 = OpVectorShuffle %v2bool %61 %61 0 1
%63 = OpLogicalEqual %v2bool %57 %62
%64 = OpAll %bool %63
OpSelectionMerge %66 None
OpBranchConditional %64 %65 %66
%65 = OpLabel
%68 = OpLoad %v4bool %input
%69 = OpVectorShuffle %v3bool %68 %68 0 1 2
%67 = OpLogicalNot %v3bool %69
%71 = OpLoad %v4bool %expected
%72 = OpVectorShuffle %v3bool %71 %71 0 1 2
%73 = OpLogicalEqual %v3bool %67 %72
%74 = OpAll %bool %73
OpBranch %66
%66 = OpLabel
%75 = OpPhi %bool %false %25 %74 %65
OpSelectionMerge %77 None
OpBranchConditional %75 %76 %77
%76 = OpLabel
%79 = OpLoad %v4bool %input
%78 = OpLogicalNot %v4bool %79
%80 = OpLoad %v4bool %expected
%81 = OpLogicalEqual %v4bool %78 %80
%82 = OpAll %bool %81
OpBranch %77
%77 = OpLabel
%83 = OpPhi %bool %false %66 %82 %76
OpSelectionMerge %85 None
OpBranchConditional %83 %84 %85
%84 = OpLabel
%88 = OpLoad %v4bool %expected
%89 = OpVectorShuffle %v2bool %88 %88 0 1
%90 = OpLogicalEqual %v2bool %87 %89
%91 = OpAll %bool %90
OpBranch %85
%85 = OpLabel
%92 = OpPhi %bool %false %77 %91 %84
OpSelectionMerge %94 None
OpBranchConditional %92 %93 %94
%93 = OpLabel
%96 = OpLoad %v4bool %expected
%97 = OpVectorShuffle %v3bool %96 %96 0 1 2
%98 = OpLogicalEqual %v3bool %95 %97
%99 = OpAll %bool %98
OpBranch %94
%94 = OpLabel
%100 = OpPhi %bool %false %85 %99 %93
OpSelectionMerge %102 None
OpBranchConditional %100 %101 %102
%101 = OpLabel
%104 = OpLoad %v4bool %expected
%105 = OpLogicalEqual %v4bool %103 %104
%106 = OpAll %bool %105
OpBranch %102
%102 = OpLabel
%107 = OpPhi %bool %false %94 %106 %101
OpSelectionMerge %112 None
OpBranchConditional %107 %110 %111
%110 = OpLabel
%113 = OpAccessChain %_ptr_Uniform_v4float %10 %int_2
%115 = OpLoad %v4float %113
OpStore %108 %115
OpBranch %112
%111 = OpLabel
%116 = OpAccessChain %_ptr_Uniform_v4float %10 %int_3
%118 = OpLoad %v4float %116
OpStore %108 %118
OpBranch %112
%112 = OpLabel
%119 = OpLoad %v4float %108
OpReturnValue %119
OpFunctionEnd

11
tests/sksl/intrinsics/Not.glsl
View File

@ -1,6 +1,11 @@
out vec4 sk_FragColor; out vec4 sk_FragColor;
bvec4 a; uniform vec4 inputH4;
void main() { uniform vec4 expectedH4;
sk_FragColor.x = float(not(a).x ? 1 : 0); uniform vec4 colorGreen;
uniform vec4 colorRed;
vec4 main() {
bvec4 input = bvec4(inputH4);
bvec4 expected = bvec4(expectedH4);
return ((((not(input.xy) == expected.xy && not(input.xyz) == expected.xyz) && not(input) == expected) && bvec2(false, true) == expected.xy) && bvec3(false, true, false) == expected.xyz) && bvec4(false, true, false, true) == expected ? colorGreen : colorRed;
} }

18
tests/sksl/intrinsics/Not.metal
View File

@ -1,19 +1,23 @@
#include <metal_stdlib> #include <metal_stdlib>
#include <simd/simd.h> #include <simd/simd.h>
using namespace metal; using namespace metal;
struct Uniforms {
float4 inputH4;
float4 expectedH4;
float4 colorGreen;
float4 colorRed;
};
struct Inputs { struct Inputs {
}; };
struct Outputs { struct Outputs {
float4 sk_FragColor [[color(0)]]; float4 sk_FragColor [[color(0)]];
}; };
struct Globals {
bool4 a; fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
};
fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Globals _globals{{}};
(void)_globals;
Outputs _out; Outputs _out;
(void)_out; (void)_out;
_out.sk_FragColor.x = float(not(_globals.a).x ? 1 : 0); bool4 input = bool4(_uniforms.inputH4);
bool4 expected = bool4(_uniforms.expectedH4);
_out.sk_FragColor = ((((all(not(input.xy) == expected.xy) && all(not(input.xyz) == expected.xyz)) && all(not(input) == expected)) && all(bool2(false, true) == expected.xy)) && all(bool3(false, true, false) == expected.xyz)) && all(bool4(false, true, false, true) == expected) ? _uniforms.colorGreen : _uniforms.colorRed;
return _out; return _out;
} }