Hash :
12584049
Author :
Date :
2024-10-21T14:04:55
Make SimplifyLoopConditions testable Add ShCompileOptions::simplifyLoopConditions, so that tests can turn it on. Later edits to simplify loop condition logic are simpler to review when the testing related edits are landed separately. Test the feature by having ESSL as the input and ESSL as the natural output, to reflect how AST changes. To make the test expectations more deterministic across code changes, change SymbolTable::kLastBuiltInId to SymbolTable::kFirstUserDefinedSymbolId. This is simpler as no code needs to know exact last built in id, so we can just ensure that the user defined symbol ids do not clash with the builtin ids. Bug: angleproject:374585769 Change-Id: Iea0efb8ac2878691d0fd5ff5cfe9a49ac754515d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5946724 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Kimmo Kinnunen <kkinnunen@apple.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258
//
// Copyright 2024 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SimplifyLoopConditions_test.cpp:
// Tests that loop conditions are simplified.
//
#include "GLSLANG/ShaderLang.h"
#include "angle_gl.h"
#include "gtest/gtest.h"
#include "tests/test_utils/compiler_test.h"
using namespace sh;
namespace
{
class SimplifyLoopConditionsTest : public MatchOutputCodeTest
{
public:
SimplifyLoopConditionsTest() : MatchOutputCodeTest(GL_FRAGMENT_SHADER, SH_ESSL_OUTPUT)
{
ShCompileOptions defaultCompileOptions = {};
defaultCompileOptions.simplifyLoopConditions = true;
defaultCompileOptions.validateAST = true;
setDefaultCompileOptions(defaultCompileOptions);
}
};
TEST_F(SimplifyLoopConditionsTest, For)
{
const char kShader[] = R"(#version 300 es
void main() {
for (;;) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
{
bool sbba = true;
while (sbba)
{
{
}
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForExprConstant)
{
const char kShader[] = R"(#version 300 es
void main() {
for (;true;) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
{
bool sbba = true;
while (sbba)
{
{
}
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForExprSymbol)
{
const char kShader[] = R"(#version 300 es
void main() {
bool b = true;
for (;b;) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
bool _ub = true;
{
while (_ub)
{
{
}
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForExpr)
{
const char kShader[] = R"(#version 300 es
void main() {
bool b = true;
for (;b == true;) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
bool _ub = true;
{
bool sbbb = (_ub == true);
while (sbbb)
{
{
}
(sbbb = (_ub == true));
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForInitExprSymbol)
{
const char kShader[] = R"(#version 300 es
void main() {
for (bool b = true; b;) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
{
bool _ub = true;
while (_ub)
{
{
}
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForInitExprSymbolExpr2)
{
const char kShader[] = R"(#version 300 es
void main() {
for (bool b = true; b; b = false) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
{
bool _ub = true;
while (_ub)
{
{
}
(_ub = false);
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForInitExprExpr2)
{
const char kShader[] = R"(#version 300 es
void main() {
for (highp int i; i < 100; ++i) { }
})";
const char kExpected[] = R"(#version 300 es
void main(){
{
highp int _ui;
bool sbbb = (_ui < 100);
while (sbbb)
{
{
}
(++_ui);
(sbbb = (_ui < 100));
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForInitExprExpr2Break)
{
const char kShader[] = R"(#version 300 es
uniform highp int u;
void main() {
for (highp int i; i < 100; ++i) { if (i < u) break; }
})";
const char kExpected[] = R"(#version 300 es
uniform highp int _uu;
void main(){
{
highp int _ui;
bool sbbc = (_ui < 100);
while (sbbc)
{
{
if ((_ui < _uu))
{
break;
}
}
(++_ui);
(sbbc = (_ui < 100));
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
TEST_F(SimplifyLoopConditionsTest, ForInitExprExpr2Continue)
{
const char kShader[] = R"(#version 300 es
uniform highp int u;
void main() {
for (highp int i; i < 100; ++i) { if (i < u) continue; ++i; }
})";
const char kExpected[] = R"(#version 300 es
uniform highp int _uu;
void main(){
{
highp int _ui;
bool sbbc = (_ui < 100);
while (sbbc)
{
{
if ((_ui < _uu))
{
(++_ui);
(sbbc = (_ui < 100));
continue;
}
(++_ui);
}
(++_ui);
(sbbc = (_ui < 100));
}
}
}
)";
compile(kShader);
EXPECT_EQ(kExpected, outputCode(SH_ESSL_OUTPUT));
}
} // namespace