Skip to content

Revert "[SPIR-V] Reland "Translate icmp eq and icmp ne to PtrEqual an… #22615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Qi-Ye-079 wants to merge 2 commits into
base: sycl
Choose a base branch
from
Open

Revert "[SPIR-V] Reland "Translate icmp eq and icmp ne to PtrEqual an… #22615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de7dfd3
Revert "[SPIR-V] Reland "Translate icmp eq and icmp ne to PtrEqual an…
Qi-Ye-079 Jul 13, 2026
48290f7
fix formatting issue
Qi-Ye-079 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions llvm-spirv/lib/SPIRV/SPIRVWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,14 +1630,9 @@ SPIRVInstruction *LLVMToSPIRVBase::transCmpInst(CmpInst *Cmp,
auto *Op0 = Cmp->getOperand(0);
SPIRVValue *TOp0 = transValue(Op0, BB);
SPIRVValue *TOp1 = transValue(Cmp->getOperand(1), BB);
// TODO: once the translator supports SPIR-V 1.4, update the condition below:
// if (/* */->isPointerTy() && /* it is not allowed to use SPIR-V 1.4 */)
if (Op0->getType()->isPointerTy()) {
auto P = Cmp->getPredicate();
if (BM->isAllowedToUseVersion(VersionNumber::SPIRV_1_4) &&
(P == ICmpInst::ICMP_EQ || P == ICmpInst::ICMP_NE) &&
Cmp->getOperand(1)->getType()->isPointerTy()) {
Op OC = P == ICmpInst::ICMP_EQ ? OpPtrEqual : OpPtrNotEqual;
return BM->addBinaryInst(OC, transType(Cmp->getType()), TOp0, TOp1, BB);
}
unsigned AS = cast<PointerType>(Op0->getType())->getAddressSpace();
SPIRVType *Ty = transType(getSizetType(AS));
TOp0 = BM->addUnaryInst(OpConvertPtrToU, Ty, TOp0, BB);
Expand Down
18 changes: 1 addition & 17 deletions llvm-spirv/test/ComparePointers.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,11 @@ kernel void test(int global *in, int global *in2) {
if (in < in2)
return;
}
// clang-format off
// RUN: %clang_cc1 -triple spir64 -x cl -cl-std=CL2.0 -O0 -emit-llvm-bc %s -o %t.bc
// RUN: llvm-spirv %t.bc --spirv-max-version=1.3 -o %t.spv
// RUN: spirv-val %t.spv
// RUN: llvm-spirv %t.bc -spirv-text --spirv-max-version=1.3 -o %t.spt
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spt
// RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

// RUN: llvm-spirv %t.bc -o %t.spv
// RUN: spirv-val %t.spv
// RUN: llvm-spirv %t.bc -spirv-text -o %t.spt
// RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV-14
// clang-format on

// CHECK-SPIRV:ConvertPtrToU
// CHECK-SPIRV:ConvertPtrToU
Expand All @@ -33,12 +26,3 @@ kernel void test(int global *in, int global *in2) {
// CHECK-SPIRV:ConvertPtrToU
// CHECK-SPIRV:ConvertPtrToU
// CHECK-SPIRV:ULessThan

// CHECK-SPIRV-14: PtrNotEqual
// CHECK-SPIRV-14: PtrEqual
// CHECK-SPIRV-14:ConvertPtrToU
// CHECK-SPIRV-14:ConvertPtrToU
// CHECK-SPIRV-14:UGreaterThan
// CHECK-SPIRV-14:ConvertPtrToU
// CHECK-SPIRV-14:ConvertPtrToU
// CHECK-SPIRV-14:ULessThan
3 changes: 2 additions & 1 deletion llvm-spirv/test/addrspacecast_generic_null.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ target triple = "spir64-unknown-unknown"
; CHECK: %_ptr_Workgroup_uchar = OpTypePointer Workgroup %uchar
; CHECK: %[[NULL:[0-9]+]] = OpConstantNull %_ptr_Generic_uchar
; CHECK: %[[CAST:[0-9]+]] = OpGenericCastToPtr %_ptr_Workgroup_uchar %[[NULL]]
; CHECK: OpPtrEqual %bool %[[CAST]]
; CHECK: %[[PTR2U:[0-9]+]] = OpConvertPtrToU %ulong %[[CAST]]
; CHECK: OpIEqual %bool %[[PTR2U]]

define spir_kernel void @bar_generic_null(ptr addrspace(3) %arg) {
%expr = icmp eq ptr addrspace(3) addrspacecast (ptr addrspace(4) null to ptr addrspace(3)), %arg
Expand Down
5 changes: 4 additions & 1 deletion llvm-spirv/test/addrspacecast_null.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

; CHECK: %_ptr_CrossWorkgroup_uchar = OpTypePointer CrossWorkgroup %uchar
; CHECK: %[[NULL:[0-9]+]] = OpConstantNull %_ptr_CrossWorkgroup_uchar
; CHECK: OpPtrEqual %bool %[[NULL]]
; We don't support OpPtrEqual instruction after KhronosGroup/SPIRV-LLVM-Translator@5e0f14b5a09d961 was reverted.
; TODO: use community check-lines after the change relands.
; CHECK: %[[U:[0-9]+]] = OpConvertPtrToU %ulong %[[NULL]]
; CHECK: OpIEqual %bool %[[U]]

target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
target triple = "spir64-unknown-unknown"
Expand Down
1 change: 1 addition & 0 deletions llvm-spirv/test/instructions/ptrcmp.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
; RUN: %if spirv-backend %{ llvm-spirv -r %t.llc.spv -o %t.llc.rev.bc %}
; RUN: %if spirv-backend %{ llvm-dis %t.llc.rev.bc -o %t.llc.rev.ll %}
; RUN: %if spirv-backend %{ FileCheck %s --check-prefix=CHECK-LLVM < %t.llc.rev.ll %}
; XFAIL: *

target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
target triple = "spir"
Expand Down
4 changes: 3 additions & 1 deletion llvm-spirv/test/type-scavenger/ptr-abuse.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ define spir_kernel void @foo() {
; CHECK: 4 Bitcast [[FLOATPTR]] [[STOREB:[0-9]+]] [[IPTR]]
; CHECK: Store [[STOREB]] {{[0-9]+}}
; CHECK: 4 Bitcast [[INTPTR]] [[CMPB:[0-9]+]] [[FPTR]]
; CHECK: 5 PtrEqual [[#]] [[#]] [[IPTR]] [[CMPB]]
; CHECK: 4 ConvertPtrToU [[SIZET:[0-9]+]] [[CMPL:[0-9]+]] [[IPTR]]
; CHECK: 4 ConvertPtrToU [[SIZET]] [[CMPR:[0-9]+]] [[CMPB]]
; CHECK: 5 IEqual {{[0-9]+}} {{[0-9]+}} [[CMPL]] [[CMPR]]
entry:
%iptr = alloca i32, align 4
%fptr = alloca float, align 4
Expand Down
Loading