8000 [ESIMD] Fix usage of uninitialized field ESIMDVerifier::ForceStateles… by v-klochkov · Pull Request #8000 · intel/llvm · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[ESIMD] Fix usage of uninitialized field ESIMDVerifier::ForceStateles… #8000

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 1 commit into from
Jan 13, 2023
Merged

[ESIMD] Fix usage of uninitialized field ESIMDVerifier::ForceStateles… #8000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions llvm/include/llvm/SYCLLowerIR/ESIMD/ESIMDVerifier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ namespace llvm {
class ModulePass;

struct ESIMDVerifierPass : public PassInfoMixin<ESIMDVerifierPass> {
ESIMDVerifierPass() : ForceStatelessMem(false) {}
ESIMDVerifierPass(bool ForceStatelessMem)
: ForceStatelessMem(ForceStatelessMem) {}
ESIMDVerifierPass(bool MayNeedForceStatelessMemModeAPI = true)
: MayNeedForceStatelessMemModeAPI(MayNeedForceStatelessMemModeAPI) {}
PreservedAnalyses run(Module &M, ModuleAnalysisManager &);
static bool isRequired() { return true; }

// The verifier pass allows more SYCL classes/methods when
// stateless memory accesses are enforced.
bool ForceStatelessMem;
// The verifier pass allows more SYCL classes/methods when stateless
// memory accesses are not explicitly disabled by compilation switches.
bool MayNeedForceStatelessMemModeAPI;
};

ModulePass *createESIMDVerifierPass();
ModulePass *
createESIMDVerifierPass(bool MayNeedForceStatelessMemModeAPI = true);

} // namespace llvm

Expand Down
30 changes: 21 additions & 9 deletions llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ namespace {

class ESIMDVerifierImpl {
const Module &M;
bool ForceStatelessMem;
bool MayNeedForceStatelessMemModeAPI;

public:
ESIMDVerifierImpl(const Module &M, bool ForceStatelessMem)
: M(M), ForceStatelessMem(ForceStatelessMem) {}
ESIMDVerifierImpl(const Module &M, bool MayNeedForceStatelessMemModeAPI)
: M(M), MayNeedForceStatelessMemModeAPI(MayNeedForceStatelessMemModeAPI) {
}

void verify() {
SmallPtrSet<const Function *, 8u> Visited;
Expand Down Expand Up @@ -136,7 +137,13 @@ class ESIMDVerifierImpl {
return LegalNameRE.match(Name);
};
if (any_of(LegalSYCLFunctions, checkLegalFunc) ||
(ForceStatelessMem &&
// TODO: Methods listed in LegalSYCLFunctionsInStatelessMode are
// indeed required to support ESIMD APIs accepting accessors in
// stateless-only mode. This unintentionally opens that API for
// unintended usage in user's programs. Can those APIs be
// allowed for ESIMD implementation only and not for general
// usage?
(MayNeedForceStatelessMemModeAPI &&
any_of(LegalSYCLFunctionsInStatelessMode, checkLegalFunc)))
continue;

Expand All @@ -154,17 +161,19 @@ class ESIMDVerifierImpl {
} // end anonymous namespace

PreservedAnalyses ESIMDVerifierPass::run(Module &M, ModuleAnalysisManager &AM) {
ESIMDVerifierImpl(M, ForceStatelessMem).verify();
ESIMDVerifierImpl(M, MayNeedForceStatelessMemModeAPI).verify();
return PreservedAnalyses::all();
}

namespace {

struct ESIMDVerifier : public ModulePass {
static char ID;
bool ForceStatelessMem;
bool MayNeedForceStatelessMemModeAPI;

ESIMDVerifier() : ModulePass(ID) {
ESIMDVerifier(bool MayNeedForceStatelessMemModeAPI = true)
: ModulePass(ID),
MayNeedForceStatelessMemModeAPI(MayNeedForceStatelessMemModeAPI) {
initializeESIMDVerifierPass(*PassRegistry::getPassRegistry());
}

Expand All @@ -173,7 +182,7 @@ struct ESIMDVerifier : public ModulePass {
}

bool runOnModule(Module &M) override {
ESIMDVerifierImpl(M, ForceStatelessMem).verify();
ESIMDVerifierImpl(M, MayNeedForceStatelessMemModeAPI).verify();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before this PR: ForceStatelessMem field was used uninitialized here.

return false;
}
};
Expand All @@ -187,4 +196,7 @@ INITIALIZE_PASS_BEGIN(ESIMDVerifier, DEBUG_TYPE, "ESIMD-specific IR verifier",
INITIALIZE_PASS_END(ESIMDVerifier, DEBUG_TYPE, "ESIMD-specific IR verifier",
false, false)

ModulePass *llvm::createESIMDVerifierPass() { return new ESIMDVerifier(); }
ModulePass *
llvm::createESIMDVerifierPass(bool MayNeedForceStatelessMemModeAPI) {
return new ESIMDVerifier(MayNeedForceStatelessMemModeAPI);
}
0