From 3316717ea54265acaeaf2cefa9baf456f23aad58 Mon Sep 17 00:00:00 2001
From: Swapnil Gaikwad <swapnil.gaikwad@arm.com>
Date: Mon, 9 Sep 2024 23:27:21 +0100
Subject: [PATCH 1/2] Fix SVE ExtendWidening ConditionalSelect tests

Fixes: #107537
---
 .../GenerateHWIntrinsicTests_Arm.cs           | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs b/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
index c8bf71ecc4be42..349185906b1144 100644
--- a/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
+++ b/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
@@ -232,20 +232,10 @@
                 {
                     for (var i = 1; i < RetElementCount; i++)
                     {
-                        var iterResult = (mask[i] != 0) ? 0 : falseVal[i];
-                        if (mask[i] != 0)
+                        if ((mask[i] != 0) ? ({ValidateRemainingResults}) : (falseVal[i] != result[i]))
                         {
-                            // Pick the trueValue
-                            if (iterResult != result[i])
-                            {
-                                succeeded = false;
-                                break;
-                            }
-                        }
-                        else
-                        {
-                            // For false, the values are merged with destination, and we do not know
-                            // those contents would be, so skip verification for them.
+                            succeeded = false;
+                            break;
                         }
                     }
                 }
@@ -262,20 +252,10 @@
                 {
                     for (var i = 1; i < RetElementCount; i++)
                     {
-                        var iterResult = (mask[i] != 0) ? trueVal[i] : 0;
-                        if (mask[i] != 0)
+                        if ((mask[i] != 0) ? (trueVal[i] != result[i]) : ({ValidateRemainingResults}))
                         {
-                            // Pick the trueValue
-                            if (iterResult != result[i])
-                            {
-                                succeeded = false;
-                                break;
-                            }
-                        }
-                        else
-                        {
-                            // For false, the values are merged with destination, and we do not know
-                            // those contents would be, so skip verification for them.
+                            succeeded = false;
+                            break;
                         }
                     }
                 }

From 610268a2ff97cd1788e029c9f32f0886e52adb40 Mon Sep 17 00:00:00 2001
From: Swapnil Gaikwad <swapnil.gaikwad@arm.com>
Date: Tue, 10 Sep 2024 23:04:00 +0100
Subject: [PATCH 2/2] Incorporate review comments

---
 .../GenerateHWIntrinsicTests_Arm.cs                    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs b/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
index 349185906b1144..ce96b7fc025aa6 100644
--- a/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
+++ b/src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
@@ -222,7 +222,7 @@
 
 const string VecReduceUnOpTest_VectorValidationLogicForCndSel = @"
             {
-                var hasFailed = (mask[0] != 0 ? {ValidateReduceOpResult}: (falseVal[0] != result[0]));
+                var hasFailed = (mask[0] != 0) ? ({ValidateReduceOpResult}): (falseVal[0] != result[0]);
 
                 if (hasFailed)
                 {
@@ -232,7 +232,8 @@
                 {
                     for (var i = 1; i < RetElementCount; i++)
                     {
-                        if ((mask[i] != 0) ? ({ValidateRemainingResults}) : (falseVal[i] != result[i]))
+                        hasFailed = (mask[i] != 0) ? ({ValidateRemainingResults}) : (falseVal[i] != result[i]);
+                        if (hasFailed)
                         {
                             succeeded = false;
                             break;
@@ -243,7 +244,7 @@
 
 const string VecReduceUnOpTest_VectorValidationLogicForCndSel_FalseValue = @"
             {
-                var hasFailed = (mask[0] != 0) ? (trueVal[0] != result[0]): {ValidateReduceOpResult};
+                var hasFailed = (mask[0] != 0) ? (trueVal[0] != result[0]): ({ValidateReduceOpResult});
                 if (hasFailed)
                 {
                     succeeded = false;
@@ -252,7 +253,8 @@
                 {
                     for (var i = 1; i < RetElementCount; i++)
                     {
-                        if ((mask[i] != 0) ? (trueVal[i] != result[i]) : ({ValidateRemainingResults}))
+                        hasFailed = (mask[i] != 0) ? (trueVal[i] != result[i]) : ({ValidateRemainingResults});
+                        if (hasFailed)
                         {
                             succeeded = false;
                             break;