Skip to content

[SYCL] Remove deprecated getPointerTo #16225

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

Merged
merged 3 commits into from
Feb 27, 2025
Merged

[SYCL] Remove deprecated getPointerTo #16225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
820970c
[CMPLRLLVM-63532] Remove deprecated getPointerTo
azwolski Dec 2, 2024
0740653
[CMPLRLLVM-63532] Fix context usage in pointer type casting for ESIM…
azwolski Dec 16, 2024
d63c924
[CMPLRLLVM-63532] Refactor formatting in translateESIMDIntrinsicCall…
azwolski Dec 17, 2024
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
5 changes: 3 additions & 2 deletions llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,8 +1575,9 @@ static void translateESIMDIntrinsicCall(CallInst &CI) {
IRBuilder<> Builder(&CI);

NewInst = Builder.CreateStore(
NewCI, Builder.CreateBitCast(CastInstruction->getPointerOperand(),
NewCI->getType()->getPointerTo()));
NewCI,
Builder.CreateBitCast(CastInstruction->getPointerOperand(),
llvm::PointerType::getUnqual(CI.getContext())));
} else {
NewInst = addCastInstIfNeeded(&CI, NewCI);
}
Expand Down
9 changes: 4 additions & 5 deletions llvm/lib/SYCLLowerIR/GlobalOffset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ PreservedAnalyses GlobalOffsetPass::run(Module &M, ModuleAnalysisManager &) {
KernelImplicitArgumentType =
ArrayType::get(Type::getInt32Ty(M.getContext()), 3);
ImplicitOffsetPtrType =
Type::getInt32Ty(M.getContext())->getPointerTo(TargetAS);
PointerType::get(Type::getInt32Ty(M.getContext()), TargetAS);
assert(
(ImplicitOffsetIntrinsic->getReturnType() == ImplicitOffsetPtrType) &&
"Implicit offset intrinsic does not return the expected type");
Expand Down Expand Up @@ -179,7 +179,7 @@ void GlobalOffsetPass::processKernelEntryPoint(
// Add the new argument to all other kernel entry points, despite not
// using the global offset.
auto *NewFunc = addOffsetArgumentToFunction(
M, Func, KernelImplicitArgumentType->getPointerTo(),
M, Func, PointerType::getUnqual(Func->getContext()),
/*KeepOriginal=*/true,
/*IsKernel=*/true)
.first;
Expand Down Expand Up @@ -343,7 +343,7 @@ std::pair<Function *, Value *> GlobalOffsetPass::addOffsetArgumentToFunction(
// addrspace(4), cast implicit offset arg to constant memory so the
// memcpy is issued into a correct address space.
auto *OrigImplicitOffsetAS4 = Builder.CreateAddrSpaceCast(
OrigImplicitOffset, Type::getInt8Ty(M.getContext())->getPointerTo(4));
OrigImplicitOffset, llvm::PointerType::get(M.getContext(), 4));
Builder.CreateMemCpy(
ImplicitOffsetAlloca, ImplicitOffsetAlloca->getAlign(),
OrigImplicitOffsetAS4, OrigImplicitOffsetAS4->getPointerAlignment(DL),
Expand Down Expand Up @@ -390,8 +390,7 @@ std::pair<Function *, Value *> GlobalOffsetPass::addOffsetArgumentToFunction(
: EntryBlock->getFirstInsertionPt();
IRBuilder<> Builder(EntryBlock, InsertionPt);
ImplicitOffset = Builder.CreateBitCast(
ImplicitOffset,
Type::getInt32Ty(M.getContext())->getPointerTo(TargetAS));
ImplicitOffset, llvm::PointerType::get(M.getContext(), TargetAS));
}

ProcessedFunctions[Func] = ImplicitOffset;
Expand Down
Loading