This patch consist of 2 parts: * A first part that removes the scalar to vector promotion for built-ins in the `SPIRVRegularizer`; * and a second part that implements the promotion for built-ins from scalar to vector in `generateExtInst`. The implementation in `SPIRVRegularizer` had several issues: * It rolled its own built-in pattern matching that was extremely permissive * the compiler would crash if the built-in had a definition * the compiler would crash if the built-in had no arguments * The compiler would crash if there were more than 2 function definitions in the module. * It'd be better if this was implemented as a module pass; where we iterate over the users of the function, instead of scanning the whole module for callers. This patch does the scalar to vector promotion just before the `OpExtInst` is generated. Without relying on the IR transformation. One change in the generated code from the previous implementation is that this version uses a single `OpCompositeConstruct` operation to convert the scalar into a vector. The old implementation inserted an element at the 0 position in an `undef` vector (using `OpCompositeInsert`); then copied that element for every vector element using `OpVectorShuffle`. This patch also adds a test (`OpExtInst_vector_promotion_bug.ll`) that highlights an issue in the builtin pattern matching that we're using: our pattern matching doesn't consider the number of arguments, only the demangled name, first and last arguments (`min(int,int,int)` matches the same builtin as `min(int, int)`).
162 lines
5.9 KiB
C++
162 lines
5.9 KiB
C++
//===-- SPIRVRegularizer.cpp - regularize IR for SPIR-V ---------*- C++ -*-===//
|
|
//
|
|
// 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
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This pass implements regularization of LLVM IR for SPIR-V. The prototype of
|
|
// the pass was taken from SPIRV-LLVM translator.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "SPIRV.h"
|
|
#include "llvm/IR/Constants.h"
|
|
#include "llvm/IR/InstIterator.h"
|
|
#include "llvm/IR/Instructions.h"
|
|
#include "llvm/IR/PassManager.h"
|
|
|
|
#include <list>
|
|
|
|
#define DEBUG_TYPE "spirv-regularizer"
|
|
|
|
using namespace llvm;
|
|
|
|
namespace {
|
|
struct SPIRVRegularizer : public FunctionPass {
|
|
public:
|
|
static char ID;
|
|
SPIRVRegularizer() : FunctionPass(ID) {}
|
|
bool runOnFunction(Function &F) override;
|
|
StringRef getPassName() const override { return "SPIR-V Regularizer"; }
|
|
|
|
void getAnalysisUsage(AnalysisUsage &AU) const override {
|
|
FunctionPass::getAnalysisUsage(AU);
|
|
}
|
|
|
|
private:
|
|
void runLowerConstExpr(Function &F);
|
|
};
|
|
} // namespace
|
|
|
|
char SPIRVRegularizer::ID = 0;
|
|
|
|
INITIALIZE_PASS(SPIRVRegularizer, DEBUG_TYPE, "SPIR-V Regularizer", false,
|
|
false)
|
|
|
|
// Since SPIR-V cannot represent constant expression, constant expressions
|
|
// in LLVM IR need to be lowered to instructions. For each function,
|
|
// the constant expressions used by instructions of the function are replaced
|
|
// by instructions placed in the entry block since it dominates all other BBs.
|
|
// Each constant expression only needs to be lowered once in each function
|
|
// and all uses of it by instructions in that function are replaced by
|
|
// one instruction.
|
|
// TODO: remove redundant instructions for common subexpression.
|
|
void SPIRVRegularizer::runLowerConstExpr(Function &F) {
|
|
LLVMContext &Ctx = F.getContext();
|
|
std::list<Instruction *> WorkList;
|
|
for (auto &II : instructions(F))
|
|
WorkList.push_back(&II);
|
|
|
|
auto FBegin = F.begin();
|
|
while (!WorkList.empty()) {
|
|
Instruction *II = WorkList.front();
|
|
|
|
auto LowerOp = [&II, &FBegin, &F](Value *V) -> Value * {
|
|
if (isa<Function>(V))
|
|
return V;
|
|
auto *CE = cast<ConstantExpr>(V);
|
|
LLVM_DEBUG(dbgs() << "[lowerConstantExpressions] " << *CE);
|
|
auto ReplInst = CE->getAsInstruction();
|
|
auto InsPoint = II->getParent() == &*FBegin ? II : &FBegin->back();
|
|
ReplInst->insertBefore(InsPoint->getIterator());
|
|
LLVM_DEBUG(dbgs() << " -> " << *ReplInst << '\n');
|
|
std::vector<Instruction *> Users;
|
|
// Do not replace use during iteration of use. Do it in another loop.
|
|
for (auto U : CE->users()) {
|
|
LLVM_DEBUG(dbgs() << "[lowerConstantExpressions] Use: " << *U << '\n');
|
|
auto InstUser = dyn_cast<Instruction>(U);
|
|
// Only replace users in scope of current function.
|
|
if (InstUser && InstUser->getParent()->getParent() == &F)
|
|
Users.push_back(InstUser);
|
|
}
|
|
for (auto &User : Users) {
|
|
if (ReplInst->getParent() == User->getParent() &&
|
|
User->comesBefore(ReplInst))
|
|
ReplInst->moveBefore(User->getIterator());
|
|
User->replaceUsesOfWith(CE, ReplInst);
|
|
}
|
|
return ReplInst;
|
|
};
|
|
|
|
WorkList.pop_front();
|
|
auto LowerConstantVec = [&II, &LowerOp, &WorkList,
|
|
&Ctx](ConstantVector *Vec,
|
|
unsigned NumOfOp) -> Value * {
|
|
if (std::all_of(Vec->op_begin(), Vec->op_end(), [](Value *V) {
|
|
return isa<ConstantExpr>(V) || isa<Function>(V);
|
|
})) {
|
|
// Expand a vector of constexprs and construct it back with
|
|
// series of insertelement instructions.
|
|
std::list<Value *> OpList;
|
|
std::transform(Vec->op_begin(), Vec->op_end(),
|
|
std::back_inserter(OpList),
|
|
[LowerOp](Value *V) { return LowerOp(V); });
|
|
Value *Repl = nullptr;
|
|
unsigned Idx = 0;
|
|
auto *PhiII = dyn_cast<PHINode>(II);
|
|
Instruction *InsPoint =
|
|
PhiII ? &PhiII->getIncomingBlock(NumOfOp)->back() : II;
|
|
std::list<Instruction *> ReplList;
|
|
for (auto V : OpList) {
|
|
if (auto *Inst = dyn_cast<Instruction>(V))
|
|
ReplList.push_back(Inst);
|
|
Repl = InsertElementInst::Create(
|
|
(Repl ? Repl : PoisonValue::get(Vec->getType())), V,
|
|
ConstantInt::get(Type::getInt32Ty(Ctx), Idx++), "",
|
|
InsPoint->getIterator());
|
|
}
|
|
WorkList.splice(WorkList.begin(), ReplList);
|
|
return Repl;
|
|
}
|
|
return nullptr;
|
|
};
|
|
for (unsigned OI = 0, OE = II->getNumOperands(); OI != OE; ++OI) {
|
|
auto *Op = II->getOperand(OI);
|
|
if (auto *Vec = dyn_cast<ConstantVector>(Op)) {
|
|
Value *ReplInst = LowerConstantVec(Vec, OI);
|
|
if (ReplInst)
|
|
II->replaceUsesOfWith(Op, ReplInst);
|
|
} else if (auto CE = dyn_cast<ConstantExpr>(Op)) {
|
|
WorkList.push_front(cast<Instruction>(LowerOp(CE)));
|
|
} else if (auto MDAsVal = dyn_cast<MetadataAsValue>(Op)) {
|
|
auto ConstMD = dyn_cast<ConstantAsMetadata>(MDAsVal->getMetadata());
|
|
if (!ConstMD)
|
|
continue;
|
|
Constant *C = ConstMD->getValue();
|
|
Value *ReplInst = nullptr;
|
|
if (auto *Vec = dyn_cast<ConstantVector>(C))
|
|
ReplInst = LowerConstantVec(Vec, OI);
|
|
if (auto *CE = dyn_cast<ConstantExpr>(C))
|
|
ReplInst = LowerOp(CE);
|
|
if (!ReplInst)
|
|
continue;
|
|
Metadata *RepMD = ValueAsMetadata::get(ReplInst);
|
|
Value *RepMDVal = MetadataAsValue::get(Ctx, RepMD);
|
|
II->setOperand(OI, RepMDVal);
|
|
WorkList.push_front(cast<Instruction>(ReplInst));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
bool SPIRVRegularizer::runOnFunction(Function &F) {
|
|
runLowerConstExpr(F);
|
|
return true;
|
|
}
|
|
|
|
FunctionPass *llvm::createSPIRVRegularizerPass() {
|
|
return new SPIRVRegularizer();
|
|
}
|