[llvm] [LV] Simplify creation of vp.load/vp.store intrinsics (PR #143804)
Philip Reames via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 11 16:04:58 PDT 2025
https://github.com/preames created https://github.com/llvm/llvm-project/pull/143804
The use of VectorBuilder here was simply obscuring what was actually going on. This is the last use of the relevant entry point for VectorBuilder so delete the entry point and tests as well.
>From 07fb6941de82d34a4b47490efb8ca7564257a956 Mon Sep 17 00:00:00 2001
From: Philip Reames <preames at rivosinc.com>
Date: Wed, 11 Jun 2025 14:54:48 -0700
Subject: [PATCH] [LV] Simplify creation of vp.load/vp.store intrinsics
The use of VectorBuilder here was simply obscuring what was
actually going on. This is the last use of the relevant entry
point for VectorBuilder so delete the entry point and tests as well.
---
llvm/include/llvm/IR/VectorBuilder.h | 9 -
llvm/lib/IR/VectorBuilder.cpp | 9 -
.../lib/Transforms/Vectorize/VPlanRecipes.cpp | 15 +-
llvm/unittests/IR/CMakeLists.txt | 1 -
llvm/unittests/IR/VectorBuilderTest.cpp | 279 ------------------
5 files changed, 6 insertions(+), 307 deletions(-)
delete mode 100644 llvm/unittests/IR/VectorBuilderTest.cpp
diff --git a/llvm/include/llvm/IR/VectorBuilder.h b/llvm/include/llvm/IR/VectorBuilder.h
index bc23842d8e6bd..5802e867e2e4c 100644
--- a/llvm/include/llvm/IR/VectorBuilder.h
+++ b/llvm/include/llvm/IR/VectorBuilder.h
@@ -96,15 +96,6 @@ class VectorBuilder {
// TODO: setStaticVL(ElementCount) for scalable types.
- // Emit a VP intrinsic call that mimics a regular instruction.
- // This operation behaves according to the VectorBuilderBehavior.
- // \p Opcode The functional instruction opcode of the emitted intrinsic.
- // \p ReturnTy The return type of the operation.
- // \p VecOpArray The operand list.
- LLVM_ABI Value *createVectorInstruction(unsigned Opcode, Type *ReturnTy,
- ArrayRef<Value *> VecOpArray,
- const Twine &Name = Twine());
-
/// Emit a VP reduction intrinsic call for recurrence kind.
/// \param RdxID The intrinsic ID of llvm.vector.reduce.*
/// \param ValTy The type of operand which the reduction operation is
diff --git a/llvm/lib/IR/VectorBuilder.cpp b/llvm/lib/IR/VectorBuilder.cpp
index 737f49b1334d7..1eb81e9b816a9 100644
--- a/llvm/lib/IR/VectorBuilder.cpp
+++ b/llvm/lib/IR/VectorBuilder.cpp
@@ -51,15 +51,6 @@ Value &VectorBuilder::requestEVL() {
return *ConstantInt::get(IntTy, StaticVectorLength.getFixedValue());
}
-Value *VectorBuilder::createVectorInstruction(unsigned Opcode, Type *ReturnTy,
- ArrayRef<Value *> InstOpArray,
- const Twine &Name) {
- auto VPID = VPIntrinsic::getForOpcode(Opcode);
- if (VPID == Intrinsic::not_intrinsic)
- return returnWithError<Value *>("No VPIntrinsic for this opcode");
- return createVectorInstructionImpl(VPID, ReturnTy, InstOpArray, Name);
-}
-
Value *VectorBuilder::createSimpleReduction(Intrinsic::ID RdxID,
Type *ValTy,
ArrayRef<Value *> InstOpArray,
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index 62b99d98a2b5e..e34ee37acaaa7 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -3086,10 +3086,9 @@ void VPWidenLoadEVLRecipe::execute(VPTransformState &State) {
Builder.CreateIntrinsic(DataTy, Intrinsic::vp_gather, {Addr, Mask, EVL},
nullptr, "wide.masked.gather");
} else {
- VectorBuilder VBuilder(Builder);
- VBuilder.setEVL(EVL).setMask(Mask);
- NewLI = cast<CallInst>(VBuilder.createVectorInstruction(
- Instruction::Load, DataTy, Addr, "vp.op.load"));
+ NewLI =
+ Builder.CreateIntrinsic(DataTy, Intrinsic::vp_load, {Addr, Mask, EVL},
+ nullptr, "vp.op.load");
}
NewLI->addParamAttr(
0, Attribute::getWithAlignment(NewLI->getContext(), Alignment));
@@ -3204,11 +3203,9 @@ void VPWidenStoreEVLRecipe::execute(VPTransformState &State) {
Intrinsic::vp_scatter,
{StoredVal, Addr, Mask, EVL});
} else {
- VectorBuilder VBuilder(Builder);
- VBuilder.setEVL(EVL).setMask(Mask);
- NewSI = cast<CallInst>(VBuilder.createVectorInstruction(
- Instruction::Store, Type::getVoidTy(EVL->getContext()),
- {StoredVal, Addr}));
+ NewSI = Builder.CreateIntrinsic(Type::getVoidTy(EVL->getContext()),
+ Intrinsic::vp_store,
+ {StoredVal, Addr, Mask, EVL});
}
NewSI->addParamAttr(
1, Attribute::getWithAlignment(NewSI->getContext(), Alignment));
diff --git a/llvm/unittests/IR/CMakeLists.txt b/llvm/unittests/IR/CMakeLists.txt
index bea6b1b46f573..b66eae93f9339 100644
--- a/llvm/unittests/IR/CMakeLists.txt
+++ b/llvm/unittests/IR/CMakeLists.txt
@@ -50,7 +50,6 @@ add_llvm_unittest(IRTests
ValueHandleTest.cpp
ValueMapTest.cpp
ValueTest.cpp
- VectorBuilderTest.cpp
VectorTypeUtilsTest.cpp
VectorTypesTest.cpp
VerifierTest.cpp
diff --git a/llvm/unittests/IR/VectorBuilderTest.cpp b/llvm/unittests/IR/VectorBuilderTest.cpp
deleted file mode 100644
index e01378a2755f0..0000000000000
--- a/llvm/unittests/IR/VectorBuilderTest.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-//===--------- VectorBuilderTest.cpp - VectorBuilder unit tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/VectorBuilder.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-namespace {
-
-static unsigned VectorNumElements = 8;
-
-class VectorBuilderTest : public testing::Test {
-protected:
- LLVMContext Context;
-
- VectorBuilderTest() : Context() {}
-
- std::unique_ptr<Module> createBuilderModule(Function *&Func, BasicBlock *&BB,
- Value *&Mask, Value *&EVL) {
- auto Mod = std::make_unique<Module>("TestModule", Context);
- auto *Int32Ty = Type::getInt32Ty(Context);
- auto *Mask8Ty =
- FixedVectorType::get(Type::getInt1Ty(Context), VectorNumElements);
- auto *VoidFuncTy =
- FunctionType::get(Type::getVoidTy(Context), {Mask8Ty, Int32Ty}, false);
- Func =
- Function::Create(VoidFuncTy, GlobalValue::ExternalLinkage, "bla", *Mod);
- Mask = Func->getArg(0);
- EVL = Func->getArg(1);
- BB = BasicBlock::Create(Context, "entry", Func);
-
- return Mod;
- }
-};
-
-/// Check that creating binary arithmetic VP intrinsics works.
-TEST_F(VectorBuilderTest, TestCreateBinaryInstructions) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- VectorBuilder VBuild(Builder);
- VBuild.setMask(Mask).setEVL(EVL);
-
- auto *FloatVecTy =
- FixedVectorType::get(Type::getFloatTy(Context), VectorNumElements);
- auto *IntVecTy =
- FixedVectorType::get(Type::getInt32Ty(Context), VectorNumElements);
-
-#define HANDLE_BINARY_INST(NUM, OPCODE, INSTCLASS) \
- { \
- auto VPID = VPIntrinsic::getForOpcode(Instruction::OPCODE); \
- bool IsFP = (#INSTCLASS)[0] == 'F'; \
- auto *ValueTy = IsFP ? FloatVecTy : IntVecTy; \
- Value *Op = PoisonValue::get(ValueTy); \
- auto *I = VBuild.createVectorInstruction(Instruction::OPCODE, ValueTy, \
- {Op, Op}); \
- ASSERT_TRUE(isa<VPIntrinsic>(I)); \
- auto *VPIntrin = cast<VPIntrinsic>(I); \
- ASSERT_EQ(VPIntrin->getIntrinsicID(), VPID); \
- ASSERT_EQ(VPIntrin->getMaskParam(), Mask); \
- ASSERT_EQ(VPIntrin->getVectorLengthParam(), EVL); \
- }
-#include "llvm/IR/Instruction.def"
-}
-
-static bool isAllTrueMask(Value *Val, unsigned NumElements) {
- auto *ConstMask = dyn_cast<Constant>(Val);
- if (!ConstMask)
- return false;
-
- // Structure check.
- if (!ConstMask->isAllOnesValue())
- return false;
-
- // Type check.
- auto *MaskVecTy = cast<FixedVectorType>(ConstMask->getType());
- if (MaskVecTy->getNumElements() != NumElements)
- return false;
-
- return MaskVecTy->getElementType()->isIntegerTy(1);
-}
-
-/// Check that creating binary arithmetic VP intrinsics works.
-TEST_F(VectorBuilderTest, TestCreateBinaryInstructions_FixedVector_NoMask) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- VectorBuilder VBuild(Builder);
- VBuild.setEVL(EVL).setStaticVL(VectorNumElements);
-
- auto *FloatVecTy =
- FixedVectorType::get(Type::getFloatTy(Context), VectorNumElements);
- auto *IntVecTy =
- FixedVectorType::get(Type::getInt32Ty(Context), VectorNumElements);
-
-#define HANDLE_BINARY_INST(NUM, OPCODE, INSTCLASS) \
- { \
- auto VPID = VPIntrinsic::getForOpcode(Instruction::OPCODE); \
- bool IsFP = (#INSTCLASS)[0] == 'F'; \
- Type *ValueTy = IsFP ? FloatVecTy : IntVecTy; \
- Value *Op = PoisonValue::get(ValueTy); \
- auto *I = VBuild.createVectorInstruction(Instruction::OPCODE, ValueTy, \
- {Op, Op}); \
- ASSERT_TRUE(isa<VPIntrinsic>(I)); \
- auto *VPIntrin = cast<VPIntrinsic>(I); \
- ASSERT_EQ(VPIntrin->getIntrinsicID(), VPID); \
- ASSERT_TRUE(isAllTrueMask(VPIntrin->getMaskParam(), VectorNumElements)); \
- ASSERT_EQ(VPIntrin->getVectorLengthParam(), EVL); \
- }
-#include "llvm/IR/Instruction.def"
-}
-
-static bool isLegalConstEVL(Value *Val, unsigned ExpectedEVL) {
- auto *ConstEVL = dyn_cast<ConstantInt>(Val);
- if (!ConstEVL)
- return false;
-
- // Value check.
- if (ConstEVL->getZExtValue() != ExpectedEVL)
- return false;
-
- // Type check.
- return ConstEVL->getType()->isIntegerTy(32);
-}
-
-/// Check that creating binary arithmetic VP intrinsics works.
-TEST_F(VectorBuilderTest, TestCreateBinaryInstructions_FixedVector_NoEVL) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- VectorBuilder VBuild(Builder);
- VBuild.setMask(Mask).setStaticVL(VectorNumElements);
-
- auto *FloatVecTy =
- FixedVectorType::get(Type::getFloatTy(Context), VectorNumElements);
- auto *IntVecTy =
- FixedVectorType::get(Type::getInt32Ty(Context), VectorNumElements);
-
-#define HANDLE_BINARY_INST(NUM, OPCODE, INSTCLASS) \
- { \
- auto VPID = VPIntrinsic::getForOpcode(Instruction::OPCODE); \
- bool IsFP = (#INSTCLASS)[0] == 'F'; \
- Type *ValueTy = IsFP ? FloatVecTy : IntVecTy; \
- Value *Op = PoisonValue::get(ValueTy); \
- auto *I = VBuild.createVectorInstruction(Instruction::OPCODE, ValueTy, \
- {Op, Op}); \
- ASSERT_TRUE(isa<VPIntrinsic>(I)); \
- auto *VPIntrin = cast<VPIntrinsic>(I); \
- ASSERT_EQ(VPIntrin->getIntrinsicID(), VPID); \
- ASSERT_EQ(VPIntrin->getMaskParam(), Mask); \
- ASSERT_TRUE( \
- isLegalConstEVL(VPIntrin->getVectorLengthParam(), VectorNumElements)); \
- }
-#include "llvm/IR/Instruction.def"
-}
-
-/// Check that creating binary arithmetic VP intrinsics works.
-TEST_F(VectorBuilderTest,
- TestCreateBinaryInstructions_FixedVector_NoMask_NoEVL) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- VectorBuilder VBuild(Builder);
- VBuild.setStaticVL(VectorNumElements);
-
- auto *FloatVecTy =
- FixedVectorType::get(Type::getFloatTy(Context), VectorNumElements);
- auto *IntVecTy =
- FixedVectorType::get(Type::getInt32Ty(Context), VectorNumElements);
-
-#define HANDLE_BINARY_INST(NUM, OPCODE, INSTCLASS) \
- { \
- auto VPID = VPIntrinsic::getForOpcode(Instruction::OPCODE); \
- bool IsFP = (#INSTCLASS)[0] == 'F'; \
- Type *ValueTy = IsFP ? FloatVecTy : IntVecTy; \
- Value *Op = PoisonValue::get(ValueTy); \
- auto *I = VBuild.createVectorInstruction(Instruction::OPCODE, ValueTy, \
- {Op, Op}); \
- ASSERT_TRUE(isa<VPIntrinsic>(I)); \
- auto *VPIntrin = cast<VPIntrinsic>(I); \
- ASSERT_EQ(VPIntrin->getIntrinsicID(), VPID); \
- ASSERT_TRUE(isAllTrueMask(VPIntrin->getMaskParam(), VectorNumElements)); \
- ASSERT_TRUE( \
- isLegalConstEVL(VPIntrin->getVectorLengthParam(), VectorNumElements)); \
- }
-#include "llvm/IR/Instruction.def"
-}
-/// Check that creating vp.load/vp.store works.
-TEST_F(VectorBuilderTest, TestCreateLoadStore) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- VectorBuilder VBuild(Builder);
- VBuild.setMask(Mask).setEVL(EVL);
-
- auto *FloatVecTy =
- FixedVectorType::get(Type::getFloatTy(Context), VectorNumElements);
-
- Value *FloatVecPtr = PoisonValue::get(Builder.getPtrTy(0));
- Value *FloatVec = PoisonValue::get(FloatVecTy);
-
- // vp.load
- auto LoadVPID = VPIntrinsic::getForOpcode(Instruction::Load);
- auto *LoadIntrin = VBuild.createVectorInstruction(Instruction::Load,
- FloatVecTy, {FloatVecPtr});
- ASSERT_TRUE(isa<VPIntrinsic>(LoadIntrin));
- auto *VPLoad = cast<VPIntrinsic>(LoadIntrin);
- ASSERT_EQ(VPLoad->getIntrinsicID(), LoadVPID);
- ASSERT_EQ(VPLoad->getMemoryPointerParam(), FloatVecPtr);
-
- // vp.store
- auto *VoidTy = Builder.getVoidTy();
- auto StoreVPID = VPIntrinsic::getForOpcode(Instruction::Store);
- auto *StoreIntrin = VBuild.createVectorInstruction(Instruction::Store, VoidTy,
- {FloatVec, FloatVecPtr});
- ASSERT_TRUE(isa<VPIntrinsic>(LoadIntrin));
- auto *VPStore = cast<VPIntrinsic>(StoreIntrin);
- ASSERT_EQ(VPStore->getIntrinsicID(), StoreVPID);
- ASSERT_EQ(VPStore->getMemoryPointerParam(), FloatVecPtr);
- ASSERT_EQ(VPStore->getMemoryDataParam(), FloatVec);
-}
-
-/// Check that the SilentlyReturnNone error handling mode works.
-TEST_F(VectorBuilderTest, TestFail_SilentlyReturnNone) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- auto *VoidTy = Builder.getVoidTy();
- VectorBuilder VBuild(Builder, VectorBuilder::Behavior::SilentlyReturnNone);
- VBuild.setMask(Mask).setEVL(EVL);
- auto *Val = VBuild.createVectorInstruction(Instruction::Br, VoidTy, {});
- ASSERT_EQ(Val, nullptr);
-}
-
-/// Check that the ReportAndFail error handling mode aborts as advertised.
-TEST_F(VectorBuilderTest, TestFail_ReportAndAbort) {
- Function *F;
- BasicBlock *BB;
- Value *Mask, *EVL;
- auto Mod = createBuilderModule(F, BB, Mask, EVL);
-
- IRBuilder<> Builder(BB);
- auto *VoidTy = Builder.getVoidTy();
- VectorBuilder VBuild(Builder, VectorBuilder::Behavior::ReportAndAbort);
- VBuild.setMask(Mask).setEVL(EVL);
- ASSERT_DEATH({ VBuild.createVectorInstruction(Instruction::Br, VoidTy, {}); },
- "No VPIntrinsic for this opcode");
-}
-
-} // end anonymous namespace
More information about the llvm-commits
mailing list