Skip to content

Commit a1e1019

Browse files
Backport #107601 (#107725)
Co-authored-by: SwapnilGaikwad <[email protected]>
1 parent c04c2b7 commit a1e1019

File tree

1 file changed

+10
-28
lines changed

1 file changed

+10
-28
lines changed

src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222

223223
const string VecReduceUnOpTest_VectorValidationLogicForCndSel = @"
224224
{
225-
var hasFailed = (mask[0] != 0 ? {ValidateReduceOpResult}: (falseVal[0] != result[0]));
225+
var hasFailed = (mask[0] != 0) ? ({ValidateReduceOpResult}): (falseVal[0] != result[0]);
226226

227227
if (hasFailed)
228228
{
@@ -232,28 +232,19 @@
232232
{
233233
for (var i = 1; i < RetElementCount; i++)
234234
{
235-
var iterResult = (mask[i] != 0) ? 0 : falseVal[i];
236-
if (mask[i] != 0)
235+
hasFailed = (mask[i] != 0) ? ({ValidateRemainingResults}) : (falseVal[i] != result[i]);
236+
if (hasFailed)
237237
{
238-
// Pick the trueValue
239-
if (iterResult != result[i])
240-
{
241-
succeeded = false;
242-
break;
243-
}
244-
}
245-
else
246-
{
247-
// For false, the values are merged with destination, and we do not know
248-
// those contents would be, so skip verification for them.
238+
succeeded = false;
239+
break;
249240
}
250241
}
251242
}
252243
}";
253244

254245
const string VecReduceUnOpTest_VectorValidationLogicForCndSel_FalseValue = @"
255246
{
256-
var hasFailed = (mask[0] != 0) ? (trueVal[0] != result[0]): {ValidateReduceOpResult};
247+
var hasFailed = (mask[0] != 0) ? (trueVal[0] != result[0]): ({ValidateReduceOpResult});
257248
if (hasFailed)
258249
{
259250
succeeded = false;
@@ -262,20 +253,11 @@
262253
{
263254
for (var i = 1; i < RetElementCount; i++)
264255
{
265-
var iterResult = (mask[i] != 0) ? trueVal[i] : 0;
266-
if (mask[i] != 0)
256+
hasFailed = (mask[i] != 0) ? (trueVal[i] != result[i]) : ({ValidateRemainingResults});
257+
if (hasFailed)
267258
{
268-
// Pick the trueValue
269-
if (iterResult != result[i])
270-
{
271-
succeeded = false;
272-
break;
273-
}
274-
}
275-
else
276-
{
277-
// For false, the values are merged with destination, and we do not know
278-
// those contents would be, so skip verification for them.
259+
succeeded = false;
260+
break;
279261
}
280262
}
281263
}

0 commit comments

Comments
 (0)