From 34f3aca3e1f4947261ddbe2cbbaf9994aec7c6a2 Mon Sep 17 00:00:00 2001
From: Marcos Maronas <marcos.maronas@intel.com>
Date: Tue, 27 Feb 2024 08:57:23 -0800
Subject: [PATCH 1/2] Fix failing specialization constants tests.

Recent changes made to specialization constants tests relied on --debug-only option, which is only enabled when assertions are enabled. This commit guards the commands using such an option to be run only when assertions are enabled.

Signed-off-by: Marcos Maronas <marcos.maronas@intel.com>
---
 .../SYCL-2020-zeroinitializer-array-of-arrays.ll             | 2 +-
 .../spec-constants/SYCL-2020-zeroinitializer.ll              | 2 +-
 llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll   | 4 ++--
 .../spec-constants/SYCL2020-struct-with-undef-padding.ll     | 2 +-
 llvm/test/tools/sycl-post-link/spec-constants/bool.ll        | 5 +++--
 .../test/tools/sycl-post-link/spec-constants/composite-O2.ll | 2 +-
 .../spec-constants/composite-default-value-padding.ll        | 2 +-
 .../tools/sycl-post-link/spec-constants/composite-no-sret.ll | 2 +-
 .../sycl-post-link/spec-constants/composite-padding-desc.ll  | 2 +-
 .../sycl-post-link/spec-constants/default-value/bool.ll      | 2 +-
 .../spec-constants/default-value/device-image.ll             | 2 +-
 .../sycl-post-link/spec-constants/default-value/esimd.ll     | 2 +-
 .../spec-constants/default-value/struct-with-padding.ll      | 2 +-
 .../tools/sycl-post-link/spec-constants/nested-struct.ll     | 2 +-
 .../spec-constants/remove-dead-private-constants.ll          | 2 +-
 .../spec-constants/struct-with-padding-in-the-middle.ll      | 2 +-
 .../spec-constants/struct-with-undef-padding-2.ll            | 2 +-
 sycl/test/basic_tests/SYCL-2020-spec-constants.cpp           | 2 +-
 18 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll
index 2e55ddec3b5f0..733a7237eb974 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll
@@ -1,7 +1,7 @@
 ; RUN: sycl-post-link --spec-const=native -S < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.ll --check-prefix CHECK-IR
 ; RUN: FileCheck %s -input-file=%t.files_0.prop --check-prefix CHECK-PROP
-; RUN: sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ;
 ; This test is intended to check that SpecConstantsPass is able to handle the
 ; situation where specialization constants with complex types such as arrays
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll
index afc1026f4c955..8c9396040cdcf 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll
@@ -1,5 +1,5 @@
 ; RUN: sycl-post-link --ir-output-only --spec-const=native %s -S -o - | FileCheck %s
-; RUN: sycl-post-link -debug-only=SpecConst --spec-const=native %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ;
 ; This test is intended to check that SpecConstantsPass is able to handle the
 ; situation where specialization constants have zeroinitializer in LLVM IR
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll
index 861a35b5619f9..23ea4eed2e8c9 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll
@@ -4,8 +4,8 @@
 ; RUN: sycl-post-link -spec-const=native < %s -S -o %t.table
 ; RUN: FileCheck %s -check-prefixes=CHECK,CHECK-RT < %t_0.ll
 ; RUN: FileCheck %s --check-prefixes=CHECK-PROPS < %t_0.prop
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=native < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE %} %else %{ %}
 
 ; This test checks that the post link tool is able to correctly transform
 ; SYCL 2020 specialization constant intrinsics for different types in a device
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll
index ff18d0d1d86c3..392fad477c2d8 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll
@@ -1,7 +1,7 @@
 ; RUN: sycl-post-link --spec-const=native -S < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.ll --check-prefix CHECK-IR
 ; RUN: FileCheck %s -input-file=%t.files_0.prop --check-prefix CHECK-PROP
-; RUN: sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ;
 ; This test is intended to check that SpecConstantsPass is able to handle the
 ; situation where specialization constants with complex types such as structs
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/bool.ll b/llvm/test/tools/sycl-post-link/spec-constants/bool.ll
index 46b8efb861139..2d5b19962c04c 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/bool.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/bool.ll
@@ -2,8 +2,9 @@
 ; RUN: FileCheck %s --input-file=%t.ll --implicit-check-not "call i8 bitcast" --check-prefixes=CHECK,CHECK-RT
 ; RUN: sycl-post-link -spec-const=emulation -S < %s --ir-output-only -o %t.ll
 ; RUN: FileCheck %s --input-file=%t.ll --check-prefixes=CHECK,CHECK-DEF
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=emulation -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION
+; RUN: %if asserts %{sycl-post-link -debug-only=SpecConst -spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE %} %else %{ %}
+; RUN: %if asserts %{sycl-post-link -debug-only=SpecConst -spec-const=emulation -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION} %else %{ %}
+
 
 ; CHECK-LABEL: void @kernel_A
 ; CHECK-RT: %[[CALL:.*]] = call i8 @_Z20__spirv_SpecConstantia(i32 [[#]], i8 1)
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll
index 37ce0d81ec575..d9cfa9e289664 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=native --ir-output-only < %s -S -o - \
 ; RUN: | FileCheck %s --implicit-check-not "call {{.*}} __sycl_getComposite2020SpecConstantValue"
-; RUN: sycl-post-link -spec-const=native -debug-only=SpecConst < %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -spec-const=native -debug-only=SpecConst < %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ;
 ; This test is intended to check that sycl-post-link tool is capable of handling
 ; composite specialization constants by lowering them into a set of SPIR-V
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll
index 31cf086a93ea1..1b812da3988c8 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=emulation < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.prop
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ;
 ; This test checks that composite specialization constants with padding gets the
 ; correct padding in their default values to prevent values being inserted at
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll
index cbdfcabd019df..c8f31e6558374 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=native --ir-output-only < %s -S -o - \
 ; RUN: | FileCheck %s --implicit-check-not "call {{.*}} __sycl_getCompositeSpecConstantValue" --implicit-check-not "call {{.*}} __sycl_getComposite2020SpecConstantValue"
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK: %[[#NS0:]] = call i32 @_Z20__spirv_SpecConstantii(i32 [[#ID:]], i32
 ; CHECK: %[[#NS1:]] = call i32 @_Z20__spirv_SpecConstantii(i32 [[#ID + 1]], i32 42)
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll
index be950d960820f..5129627c96c1e 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=native < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.prop
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG 
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{  %}
 ;
 ; This test checks that composite specialization constants with implicit padding
 ; at the end of the composite type will have an additional padding descriptor at
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll
index 29442cdae7efd..62811e1f286f6 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll
@@ -2,7 +2,7 @@
 
 ; RUN: sycl-post-link -split=auto -spec-const=native -S -o %t.table %s -generate-device-image-default-spec-consts
 ; RUN: FileCheck %s -input-file %t_1.ll --implicit-check-not="SpecConst"
-; RUN: sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK: %bool1 = trunc i8 1 to i1
 ; CHECK: %frombool = zext i1 %bool1 to i8
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll
index 0e25d118bab0e..e5ee3e8dbbee9 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll
@@ -10,7 +10,7 @@
 ; RUN: FileCheck %s -input-file %t_1.ll -check-prefix=CHECK-IR1 --implicit-check-not "SpecConstant"
 ; RUN: FileCheck %s -input-file %t_0.sym -check-prefix=CHECK-SYM0
 ; RUN: FileCheck %s -input-file %t_1.sym -check-prefix=CHECK-SYM1
-; RUN: sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK-TABLE: {{.*}}_0.ll|{{.*}}_0.prop|{{.*}}_0.sym
 ; CHECK-TABLE: {{.*}}_1.ll|{{.*}}_1.prop|{{.*}}_1.sym
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll
index 5f4ea0eb83e00..5371694d42d6c 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s -input-file=%t.table -check-prefix=CHECK-TABLE
 ; RUN: FileCheck %s -input-file=%t_1.prop -check-prefix=CHECK-PROP
 ; RUN: FileCheck %s -input-file=%t_esimd_1.prop -check-prefix=CHECK-ESIMD-PROP
-; RUN: sycl-post-link -debug-only=SpecConst -split=auto -split-esimd -lower-esimd -O2 -spec-const=native %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -split-esimd -lower-esimd -O2 -spec-const=native %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK-TABLE: {{.*}}_esimd_0.bc|{{.*}}_esimd_0.prop
 ; CHECK-TABLE: {{.*}}_0.bc|{{.*}}_0.prop
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll
index ab4b41e096da5..7ab98595dca37 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll
@@ -4,7 +4,7 @@
 ; RUN: cat %t.table | FileCheck %s -check-prefix=CHECK-TABLE
 ; RUN: cat %t_1.prop | FileCheck %s -check-prefix=CHECK-PROP1
 ; RUN: cat %t_1.ll | FileCheck %s -check-prefix=CHECK-IR1 --implicit-check-not SpecConstant
-; RUN: sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK-TABLE: {{.*}}_0.ll|{{.*}}_0.prop
 ; CHECK-TABLE: {{.*}}_1.ll|{{.*}}_1.prop
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll b/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll
index a634162032a31..95ee688d47c6e 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll
@@ -3,7 +3,7 @@
 
 ; RUN: sycl-post-link --spec-const=native -S %s -o %t.table
 ; RUN: FileCheck %s -input-file=%t_0.ll
-; RUN: sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG 
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK: %[[#SCV1:]] = call i8 @_Z20__spirv_SpecConstantia(i32 [[#SCID1:]], i8 120)
 ; CHECK: %[[#SCV2:]] = call i8 @_Z20__spirv_SpecConstantia(i32 [[#SCID2:]], i8 121)
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll b/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll
index 2f27b037d31bf..06e0cc2f60ca7 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll
@@ -4,7 +4,7 @@
 ; RUN: sycl-post-link -split=auto -spec-const=native -symbols -S -o %t.table %s -generate-device-image-default-spec-consts
 ; RUN: FileCheck %s -input-file %t_0.ll -check-prefix=CHECK-IR0
 ; RUN: FileCheck %s -input-file %t_1.ll -check-prefix=CHECK-IR1
-; RUN: sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 
 ; CHECK-IR0-NOT: @__usid_str = private
 ; CHECK-IR1-NOT: @__usid_str = private
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll
index b57ebddae479e..6c5c2261fa8fa 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link --spec-const=native -S %s -o %t.table
 ; RUN: FileCheck %s -input-file=%t_0.ll
-; RUN: sycl-post-link -debug-only=SpecConst --spec-const=native -S %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ; LLVM IR for this test is produced from the following SYCL code snippet:
 ;
 ; #include <sycl/sycl.hpp>
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll
index 56d10cb558d6b..dedd45553519e 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll
@@ -36,7 +36,7 @@
 ;
 ; RUN: sycl-post-link --spec-const=native -S < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.ll
-; RUN: sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
 ;
 ; CHECK: %[[#A:]] = call float @_Z20__spirv_SpecConstantif(i32 [[#ID:]], float 0x40091EB860000000)
 ; CHECK: %[[#B:]] = call i32 @_Z20__spirv_SpecConstantii(i32 [[#ID+1]], i32 42)
diff --git a/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp b/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp
index 9b085fec2f82d..e102773934438 100644
--- a/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp
+++ b/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp
@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-device-only -c -o %t.bc %s
-// RUN: sycl-post-link -debug-only=SpecConst %t.bc -spec-const=native -o %t-split1.txt 2>&1 | FileCheck %s -check-prefixes=CHECK-LOG
+// RUN: %if asserts %{sycl-post-link -debug-only=SpecConst %t.bc -spec-const=native -o %t-split1.txt 2>&1 | FileCheck %s -check-prefixes=CHECK-LOG %} %else %{sycl-post-link %t.bc -spec-const=native -o %t-split1.txt 2>&1 %}
 // RUN: cat %t-split1_0.prop | FileCheck %s -check-prefixes=CHECK,CHECK-RT
 // RUN: sycl-post-link %t.bc -spec-const=emulation -o %t-split2.txt
 // RUN: cat %t-split2_0.prop | FileCheck %s -check-prefixes=CHECK,CHECK-DEF

From ca54db40fca25887101cfeb3fe9c586088e0fb82 Mon Sep 17 00:00:00 2001
From: Marcos Maronas <marcos.maronas@intel.com>
Date: Tue, 27 Feb 2024 12:26:18 -0800
Subject: [PATCH 2/2] Remove empty else.

Signed-off-by: Marcos Maronas <marcos.maronas@intel.com>
---
 .../SYCL-2020-zeroinitializer-array-of-arrays.ll              | 2 +-
 .../spec-constants/SYCL-2020-zeroinitializer.ll               | 2 +-
 llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll    | 4 ++--
 .../spec-constants/SYCL2020-struct-with-undef-padding.ll      | 2 +-
 llvm/test/tools/sycl-post-link/spec-constants/bool.ll         | 4 ++--
 llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll | 2 +-
 .../spec-constants/composite-default-value-padding.ll         | 2 +-
 .../tools/sycl-post-link/spec-constants/composite-no-sret.ll  | 2 +-
 .../sycl-post-link/spec-constants/composite-padding-desc.ll   | 2 +-
 .../tools/sycl-post-link/spec-constants/default-value/bool.ll | 2 +-
 .../spec-constants/default-value/device-image.ll              | 2 +-
 .../sycl-post-link/spec-constants/default-value/esimd.ll      | 2 +-
 .../spec-constants/default-value/struct-with-padding.ll       | 2 +-
 .../test/tools/sycl-post-link/spec-constants/nested-struct.ll | 2 +-
 .../spec-constants/remove-dead-private-constants.ll           | 2 +-
 .../spec-constants/struct-with-padding-in-the-middle.ll       | 2 +-
 .../spec-constants/struct-with-undef-padding-2.ll             | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll
index 733a7237eb974..c7ab60148e1c5 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer-array-of-arrays.ll
@@ -1,7 +1,7 @@
 ; RUN: sycl-post-link --spec-const=native -S < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.ll --check-prefix CHECK-IR
 ; RUN: FileCheck %s -input-file=%t.files_0.prop --check-prefix CHECK-PROP
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; This test is intended to check that SpecConstantsPass is able to handle the
 ; situation where specialization constants with complex types such as arrays
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll
index 8c9396040cdcf..fb8a162d76c6c 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020-zeroinitializer.ll
@@ -1,5 +1,5 @@
 ; RUN: sycl-post-link --ir-output-only --spec-const=native %s -S -o - | FileCheck %s
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; This test is intended to check that SpecConstantsPass is able to handle the
 ; situation where specialization constants have zeroinitializer in LLVM IR
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll
index 23ea4eed2e8c9..daa0a08ec9231 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL-2020.ll
@@ -4,8 +4,8 @@
 ; RUN: sycl-post-link -spec-const=native < %s -S -o %t.table
 ; RUN: FileCheck %s -check-prefixes=CHECK,CHECK-RT < %t_0.ll
 ; RUN: FileCheck %s --check-prefixes=CHECK-PROPS < %t_0.prop
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION %} %else %{ %}
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s -S 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE %}
 
 ; This test checks that the post link tool is able to correctly transform
 ; SYCL 2020 specialization constant intrinsics for different types in a device
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll b/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll
index 392fad477c2d8..21fbdca449102 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/SYCL2020-struct-with-undef-padding.ll
@@ -1,7 +1,7 @@
 ; RUN: sycl-post-link --spec-const=native -S < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.ll --check-prefix CHECK-IR
 ; RUN: FileCheck %s -input-file=%t.files_0.prop --check-prefix CHECK-PROP
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; This test is intended to check that SpecConstantsPass is able to handle the
 ; situation where specialization constants with complex types such as structs
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/bool.ll b/llvm/test/tools/sycl-post-link/spec-constants/bool.ll
index 2d5b19962c04c..4d1d63048b60b 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/bool.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/bool.ll
@@ -2,8 +2,8 @@
 ; RUN: FileCheck %s --input-file=%t.ll --implicit-check-not "call i8 bitcast" --check-prefixes=CHECK,CHECK-RT
 ; RUN: sycl-post-link -spec-const=emulation -S < %s --ir-output-only -o %t.ll
 ; RUN: FileCheck %s --input-file=%t.ll --check-prefixes=CHECK,CHECK-DEF
-; RUN: %if asserts %{sycl-post-link -debug-only=SpecConst -spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE %} %else %{ %}
-; RUN: %if asserts %{sycl-post-link -debug-only=SpecConst -spec-const=emulation -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION} %else %{ %}
+; RUN: %if asserts %{sycl-post-link -debug-only=SpecConst -spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-NATIVE %}
+; RUN: %if asserts %{sycl-post-link -debug-only=SpecConst -spec-const=emulation -S < %s 2>&1 | FileCheck %s --check-prefixes=CHECK-LOG,CHECK-LOG-EMULATION %}
 
 
 ; CHECK-LABEL: void @kernel_A
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll
index d9cfa9e289664..538385b0401ef 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-O2.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=native --ir-output-only < %s -S -o - \
 ; RUN: | FileCheck %s --implicit-check-not "call {{.*}} __sycl_getComposite2020SpecConstantValue"
-; RUN: %if asserts %{ sycl-post-link -spec-const=native -debug-only=SpecConst < %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -spec-const=native -debug-only=SpecConst < %s -S 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; This test is intended to check that sycl-post-link tool is capable of handling
 ; composite specialization constants by lowering them into a set of SPIR-V
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll
index 1b812da3988c8..968e94547a194 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-default-value-padding.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=emulation < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.prop
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=emulation < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; This test checks that composite specialization constants with padding gets the
 ; correct padding in their default values to prevent values being inserted at
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll
index c8f31e6558374..87715cb2db45a 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-no-sret.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=native --ir-output-only < %s -S -o - \
 ; RUN: | FileCheck %s --implicit-check-not "call {{.*}} __sycl_getCompositeSpecConstantValue" --implicit-check-not "call {{.*}} __sycl_getComposite2020SpecConstantValue"
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK: %[[#NS0:]] = call i32 @_Z20__spirv_SpecConstantii(i32 [[#ID:]], i32
 ; CHECK: %[[#NS1:]] = call i32 @_Z20__spirv_SpecConstantii(i32 [[#ID + 1]], i32 42)
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll b/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll
index 5129627c96c1e..1064e662eff01 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/composite-padding-desc.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link -spec-const=native < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.prop
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{  %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; This test checks that composite specialization constants with implicit padding
 ; at the end of the composite type will have an additional padding descriptor at
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll
index 62811e1f286f6..2a8a82f262611 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/bool.ll
@@ -2,7 +2,7 @@
 
 ; RUN: sycl-post-link -split=auto -spec-const=native -S -o %t.table %s -generate-device-image-default-spec-consts
 ; RUN: FileCheck %s -input-file %t_1.ll --implicit-check-not="SpecConst"
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK: %bool1 = trunc i8 1 to i1
 ; CHECK: %frombool = zext i1 %bool1 to i8
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll
index e5ee3e8dbbee9..01af2cd741dde 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/device-image.ll
@@ -10,7 +10,7 @@
 ; RUN: FileCheck %s -input-file %t_1.ll -check-prefix=CHECK-IR1 --implicit-check-not "SpecConstant"
 ; RUN: FileCheck %s -input-file %t_0.sym -check-prefix=CHECK-SYM0
 ; RUN: FileCheck %s -input-file %t_1.sym -check-prefix=CHECK-SYM1
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK-TABLE: {{.*}}_0.ll|{{.*}}_0.prop|{{.*}}_0.sym
 ; CHECK-TABLE: {{.*}}_1.ll|{{.*}}_1.prop|{{.*}}_1.sym
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll
index 5371694d42d6c..dbd995bd0ca44 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/esimd.ll
@@ -4,7 +4,7 @@
 ; RUN: FileCheck %s -input-file=%t.table -check-prefix=CHECK-TABLE
 ; RUN: FileCheck %s -input-file=%t_1.prop -check-prefix=CHECK-PROP
 ; RUN: FileCheck %s -input-file=%t_esimd_1.prop -check-prefix=CHECK-ESIMD-PROP
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -split-esimd -lower-esimd -O2 -spec-const=native %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -split-esimd -lower-esimd -O2 -spec-const=native %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK-TABLE: {{.*}}_esimd_0.bc|{{.*}}_esimd_0.prop
 ; CHECK-TABLE: {{.*}}_0.bc|{{.*}}_0.prop
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll b/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll
index 7ab98595dca37..51dc1c557fd7f 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/default-value/struct-with-padding.ll
@@ -4,7 +4,7 @@
 ; RUN: cat %t.table | FileCheck %s -check-prefix=CHECK-TABLE
 ; RUN: cat %t_1.prop | FileCheck %s -check-prefix=CHECK-PROP1
 ; RUN: cat %t_1.ll | FileCheck %s -check-prefix=CHECK-IR1 --implicit-check-not SpecConstant
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK-TABLE: {{.*}}_0.ll|{{.*}}_0.prop
 ; CHECK-TABLE: {{.*}}_1.ll|{{.*}}_1.prop
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll b/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll
index 95ee688d47c6e..f0bd6b8df6c66 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/nested-struct.ll
@@ -3,7 +3,7 @@
 
 ; RUN: sycl-post-link --spec-const=native -S %s -o %t.table
 ; RUN: FileCheck %s -input-file=%t_0.ll
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -spec-const=native < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK: %[[#SCV1:]] = call i8 @_Z20__spirv_SpecConstantia(i32 [[#SCID1:]], i8 120)
 ; CHECK: %[[#SCV2:]] = call i8 @_Z20__spirv_SpecConstantia(i32 [[#SCID2:]], i8 121)
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll b/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll
index 06e0cc2f60ca7..fb3b69228599e 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/remove-dead-private-constants.ll
@@ -4,7 +4,7 @@
 ; RUN: sycl-post-link -split=auto -spec-const=native -symbols -S -o %t.table %s -generate-device-image-default-spec-consts
 ; RUN: FileCheck %s -input-file %t_0.ll -check-prefix=CHECK-IR0
 ; RUN: FileCheck %s -input-file %t_1.ll -check-prefix=CHECK-IR1
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst -split=auto -spec-const=native -symbols -S %s -generate-device-image-default-spec-consts 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 
 ; CHECK-IR0-NOT: @__usid_str = private
 ; CHECK-IR1-NOT: @__usid_str = private
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll
index 6c5c2261fa8fa..57ddbfe23b55f 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-padding-in-the-middle.ll
@@ -1,6 +1,6 @@
 ; RUN: sycl-post-link --spec-const=native -S %s -o %t.table
 ; RUN: FileCheck %s -input-file=%t_0.ll
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ; LLVM IR for this test is produced from the following SYCL code snippet:
 ;
 ; #include <sycl/sycl.hpp>
diff --git a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll
index dedd45553519e..233933d87f6c2 100644
--- a/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll
+++ b/llvm/test/tools/sycl-post-link/spec-constants/struct-with-undef-padding-2.ll
@@ -36,7 +36,7 @@
 ;
 ; RUN: sycl-post-link --spec-const=native -S < %s -o %t.files.table
 ; RUN: FileCheck %s -input-file=%t.files_0.ll
-; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %} %else %{ %}
+; RUN: %if asserts %{ sycl-post-link -debug-only=SpecConst --spec-const=native -S < %s 2>&1 | FileCheck %s --check-prefix=CHECK-LOG %}
 ;
 ; CHECK: %[[#A:]] = call float @_Z20__spirv_SpecConstantif(i32 [[#ID:]], float 0x40091EB860000000)
 ; CHECK: %[[#B:]] = call i32 @_Z20__spirv_SpecConstantii(i32 [[#ID+1]], i32 42)