[Mlir-commits] [clang] [mlir] [CIR][OpenMP][MLIR] Allow passing of vfs::FileSystem through ModuleTranslation (PR #195319)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Fri May 1 11:36:00 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-mlir
Author: Jan Leyonberg (jsjodin)
<details>
<summary>Changes</summary>
This change optionally allows passing a pointer to a vfs::FileSystem through ModuleTranslation down to the OpenMPToLLVMTranslation. This will prevent IO sandbox errors when enabling OpenMP target regions in CIR, since accessing the file system must go through the proper APIs.
Assisted-by: Cursor / claude-4.6-opus-high
---
Full diff: https://github.com/llvm/llvm-project/pull/195319.diff
7 Files Affected:
- (modified) clang/include/clang/CIR/LowerToLLVM.h (+5-1)
- (modified) clang/lib/CIR/FrontendAction/CIRGenAction.cpp (+5-3)
- (modified) clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp (+5-3)
- (modified) mlir/include/mlir/Target/LLVMIR/Export.h (+8-1)
- (modified) mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h (+14-3)
- (modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (+23-27)
- (modified) mlir/lib/Target/LLVMIR/ModuleTranslation.cpp (+13-4)
``````````diff
diff --git a/clang/include/clang/CIR/LowerToLLVM.h b/clang/include/clang/CIR/LowerToLLVM.h
index 393b997c50695..df5f9221842ea 100644
--- a/clang/include/clang/CIR/LowerToLLVM.h
+++ b/clang/include/clang/CIR/LowerToLLVM.h
@@ -18,6 +18,9 @@
namespace llvm {
class LLVMContext;
class Module;
+namespace vfs {
+class FileSystem;
+} // namespace vfs
} // namespace llvm
namespace mlir {
@@ -30,7 +33,8 @@ namespace direct {
std::unique_ptr<llvm::Module>
lowerDirectlyFromCIRToLLVMIR(mlir::ModuleOp mlirModule,
llvm::LLVMContext &llvmCtx,
- llvm::StringRef mlirSaveTempsOutFile = {});
+ llvm::StringRef mlirSaveTempsOutFile = {},
+ llvm::vfs::FileSystem *fs = nullptr);
} // namespace direct
} // namespace cir
diff --git a/clang/lib/CIR/FrontendAction/CIRGenAction.cpp b/clang/lib/CIR/FrontendAction/CIRGenAction.cpp
index ab273539b1ce2..af38872c5ca98 100644
--- a/clang/lib/CIR/FrontendAction/CIRGenAction.cpp
+++ b/clang/lib/CIR/FrontendAction/CIRGenAction.cpp
@@ -48,9 +48,10 @@ getBackendActionFromOutputType(CIRGenAction::OutputType Action) {
static std::unique_ptr<llvm::Module>
lowerFromCIRToLLVMIR(mlir::ModuleOp MLIRModule, llvm::LLVMContext &LLVMCtx,
- llvm::StringRef mlirSaveTempsOutFile = {}) {
+ llvm::StringRef mlirSaveTempsOutFile = {},
+ llvm::vfs::FileSystem *fs = nullptr) {
return direct::lowerDirectlyFromCIRToLLVMIR(MLIRModule, LLVMCtx,
- mlirSaveTempsOutFile);
+ mlirSaveTempsOutFile, fs);
}
class CIRGenConsumer : public clang::ASTConsumer {
@@ -160,7 +161,8 @@ class CIRGenConsumer : public clang::ASTConsumer {
llvm::LLVMContext LLVMCtx;
std::unique_ptr<llvm::Module> LLVMModule =
- lowerFromCIRToLLVMIR(MlirModule, LLVMCtx, mlirSaveTempsOutFile);
+ lowerFromCIRToLLVMIR(MlirModule, LLVMCtx, mlirSaveTempsOutFile,
+ &CI.getVirtualFileSystem());
BackendAction BEAction = getBackendActionFromOutputType(Action);
emitBackendOutput(
diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
index e17c7a209db6b..391aace41d403 100644
--- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
+++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
@@ -51,6 +51,7 @@
#include "llvm/Support/Casting.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/TimeProfiler.h"
+#include "llvm/Support/VirtualFileSystem.h"
#include "llvm/Support/raw_ostream.h"
using namespace cir;
@@ -5070,7 +5071,8 @@ void populateCIRToLLVMPasses(mlir::OpPassManager &pm) {
std::unique_ptr<llvm::Module>
lowerDirectlyFromCIRToLLVMIR(mlir::ModuleOp mlirModule, LLVMContext &llvmCtx,
- StringRef mlirSaveTempsOutFile) {
+ StringRef mlirSaveTempsOutFile,
+ llvm::vfs::FileSystem *fs) {
llvm::TimeTraceScope scope("lower from CIR to LLVM directly");
mlir::MLIRContext *mlirCtx = mlirModule.getContext();
@@ -5101,8 +5103,8 @@ lowerDirectlyFromCIRToLLVMIR(mlir::ModuleOp mlirModule, LLVMContext &llvmCtx,
llvm::TimeTraceScope translateScope("translateModuleToLLVMIR");
StringRef moduleName = mlirModule.getName().value_or("CIRToLLVMModule");
- std::unique_ptr<llvm::Module> llvmModule =
- mlir::translateModuleToLLVMIR(mlirModule, llvmCtx, moduleName);
+ std::unique_ptr<llvm::Module> llvmModule = mlir::translateModuleToLLVMIR(
+ mlirModule, llvmCtx, moduleName, /*disableVerification=*/false, fs);
if (!llvmModule) {
// FIXME: Handle any errors where they occurs and return a nullptr here.
diff --git a/mlir/include/mlir/Target/LLVMIR/Export.h b/mlir/include/mlir/Target/LLVMIR/Export.h
index 893aaaa4faff6..49cac420c26bf 100644
--- a/mlir/include/mlir/Target/LLVMIR/Export.h
+++ b/mlir/include/mlir/Target/LLVMIR/Export.h
@@ -15,6 +15,9 @@
namespace llvm {
class LLVMContext;
class Module;
+namespace vfs {
+class FileSystem;
+} // namespace vfs
} // namespace llvm
namespace mlir {
@@ -25,10 +28,14 @@ class Operation;
/// registered implementation of the LLVMTranslationDialectInterface. Returns
/// nullptr when the translation fails.
/// Verifies the produced LLVM module, except when `disableVerification` is set.
+/// An optional \p fs can be provided to avoid direct filesystem access (e.g.,
+/// to comply with the IO sandbox in clang -cc1). When null, the real filesystem
+/// is used.
std::unique_ptr<llvm::Module>
translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
llvm::StringRef name = "LLVMDialectModule",
- bool disableVerification = false);
+ bool disableVerification = false,
+ llvm::vfs::FileSystem *fs = nullptr);
} // namespace mlir
#endif // MLIR_TARGET_LLVMIR_EXPORT_H
diff --git a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
index 443f7c9fc2cb2..2516818b320aa 100644
--- a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
+++ b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
@@ -36,6 +36,9 @@ class Function;
class IRBuilderBase;
class OpenMPIRBuilder;
class Value;
+namespace vfs {
+class FileSystem;
+} // namespace vfs
} // namespace llvm
namespace mlir {
@@ -64,7 +67,7 @@ class ComdatSelectorOp;
class ModuleTranslation {
friend std::unique_ptr<llvm::Module>
mlir::translateModuleToLLVMIR(Operation *, llvm::LLVMContext &, StringRef,
- bool);
+ bool, llvm::vfs::FileSystem *);
public:
/// Stores the mapping between a function name and its LLVM IR representation.
@@ -275,6 +278,10 @@ class ModuleTranslation {
/// constructed.
llvm::OpenMPIRBuilder *getOpenMPBuilder();
+ /// Returns the virtual filesystem to use for file operations. Falls back to
+ /// the real filesystem if none was provided.
+ llvm::vfs::FileSystem &getFileSystem();
+
/// Returns the LLVM module in which the IR is being constructed.
llvm::Module *getLLVMModule() { return llvmModule.get(); }
@@ -386,8 +393,8 @@ class ModuleTranslation {
llvm::Attribute convertAllocsizeAttr(DenseI32ArrayAttr allocsizeAttr);
private:
- ModuleTranslation(Operation *module,
- std::unique_ptr<llvm::Module> llvmModule);
+ ModuleTranslation(Operation *module, std::unique_ptr<llvm::Module> llvmModule,
+ llvm::vfs::FileSystem *fs = nullptr);
~ModuleTranslation();
/// Converts individual components.
@@ -456,6 +463,10 @@ class ModuleTranslation {
/// Builder for LLVM IR generation of OpenMP constructs.
std::unique_ptr<llvm::OpenMPIRBuilder> ompBuilder;
+ /// Optional virtual filesystem for file operations. When null, the real
+ /// filesystem is used (via getFileSystem()). Not owned.
+ llvm::vfs::FileSystem *fileSystem = nullptr;
+
/// Mappings between llvm.mlir.global definitions and corresponding globals.
DenseMap<Operation *, llvm::GlobalValue *> globalsMapping;
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index 53020dc867926..f03986b44a550 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -34,7 +34,6 @@
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/MDBuilder.h"
#include "llvm/IR/ReplaceConstant.h"
-#include "llvm/Support/FileSystem.h"
#include "llvm/Support/VirtualFileSystem.h"
#include "llvm/TargetParser/Triple.h"
#include "llvm/Transforms/Utils/ModuleUtils.h"
@@ -5011,7 +5010,8 @@ static Value getBaseValueForTypeLookup(Value value) {
static llvm::SmallString<64>
getDeclareTargetRefPtrSuffix(LLVM::GlobalOp globalOp,
- llvm::OpenMPIRBuilder &ompBuilder) {
+ llvm::OpenMPIRBuilder &ompBuilder,
+ llvm::vfs::FileSystem &vfs) {
llvm::SmallString<64> suffix;
llvm::raw_svector_ostream os(suffix);
if (globalOp.getVisibility() == mlir::SymbolTable::Visibility::Private) {
@@ -5021,10 +5021,9 @@ getDeclareTargetRefPtrSuffix(LLVM::GlobalOp globalOp,
llvm::StringRef(loc.getFilename()), loc.getLine());
};
- auto vfs = llvm::vfs::getRealFileSystem();
os << llvm::format(
"_%x",
- ompBuilder.getTargetEntryUniqueInfo(fileInfoCallBack, *vfs).FileID);
+ ompBuilder.getTargetEntryUniqueInfo(fileInfoCallBack, vfs).FileID);
}
os << "_decl_tgt_ref_ptr";
@@ -5071,8 +5070,8 @@ getRefPtrIfDeclareTarget(Value value,
(declareTargetGlobal.getDeclareTargetCaptureClause() ==
omp::DeclareTargetCaptureClause::to &&
ompBuilder->Config.hasRequiresUnifiedSharedMemory())) {
- llvm::SmallString<64> suffix =
- getDeclareTargetRefPtrSuffix(gOp, *ompBuilder);
+ llvm::SmallString<64> suffix = getDeclareTargetRefPtrSuffix(
+ gOp, *ompBuilder, moduleTranslation.getFileSystem());
if (gOp.getSymName().contains(suffix))
return moduleTranslation.getLLVMModule()->getNamedValue(
@@ -6669,23 +6668,19 @@ convertFlagsAttr(Operation *op, mlir::omp::FlagsAttr attribute,
static void getTargetEntryUniqueInfo(llvm::TargetRegionEntryInfo &targetInfo,
omp::TargetOp targetOp,
+ llvm::OpenMPIRBuilder &ompBuilder,
+ llvm::vfs::FileSystem &vfs,
llvm::StringRef parentName = "") {
auto fileLoc = targetOp.getLoc()->findInstanceOf<FileLineColLoc>();
-
assert(fileLoc && "No file found from location");
- StringRef fileName = fileLoc.getFilename().getValue();
-
- llvm::sys::fs::UniqueID id;
- uint64_t line = fileLoc.getLine();
- if (auto ec = llvm::sys::fs::getUniqueID(fileName, id)) {
- size_t fileHash = llvm::hash_value(fileName.str());
- size_t deviceId = 0xdeadf17e;
- targetInfo =
- llvm::TargetRegionEntryInfo(parentName, deviceId, fileHash, line);
- } else {
- targetInfo = llvm::TargetRegionEntryInfo(parentName, id.getDevice(),
- id.getFile(), line);
- }
+
+ auto fileInfoCallBack = [&fileLoc]() {
+ return std::pair<std::string, uint64_t>(
+ llvm::StringRef(fileLoc.getFilename()), fileLoc.getLine());
+ };
+
+ targetInfo =
+ ompBuilder.getTargetEntryUniqueInfo(fileInfoCallBack, vfs, parentName);
}
static void
@@ -7452,7 +7447,9 @@ convertOmpTarget(Operation &opInst, llvm::IRBuilderBase &builder,
llvm::TargetRegionEntryInfo entryInfo;
- getTargetEntryUniqueInfo(entryInfo, targetOp, parentName);
+ getTargetEntryUniqueInfo(entryInfo, targetOp,
+ *moduleTranslation.getOpenMPBuilder(),
+ moduleTranslation.getFileSystem(), parentName);
MapInfoData mapData;
collectMapDataFromMapOperands(mapData, mapVars, moduleTranslation, dl,
@@ -7669,11 +7666,11 @@ convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
lineNo);
};
- auto vfs = llvm::vfs::getRealFileSystem();
+ llvm::vfs::FileSystem &vfs = moduleTranslation.getFileSystem();
ompBuilder->registerTargetGlobalVariable(
captureClause, deviceClause, isDeclaration, isExternallyVisible,
- ompBuilder->getTargetEntryUniqueInfo(fileInfoCallBack, *vfs),
+ ompBuilder->getTargetEntryUniqueInfo(fileInfoCallBack, vfs),
mangledName, generatedRefs, /*OpenMPSimd*/ false, targetTriple,
/*GlobalInitializer*/ nullptr, /*VariableLinkage*/ nullptr,
gVal->getType(), gVal);
@@ -7684,7 +7681,7 @@ convertDeclareTargetAttr(Operation *op, mlir::omp::DeclareTargetAttr attribute,
ompBuilder->Config.hasRequiresUnifiedSharedMemory())) {
ompBuilder->getAddrOfDeclareTargetVar(
captureClause, deviceClause, isDeclaration, isExternallyVisible,
- ompBuilder->getTargetEntryUniqueInfo(fileInfoCallBack, *vfs),
+ ompBuilder->getTargetEntryUniqueInfo(fileInfoCallBack, vfs),
mangledName, generatedRefs, /*OpenMPSimd*/ false, targetTriple,
gVal->getType(), /*GlobalInitializer*/ nullptr,
/*VariableLinkage*/ nullptr);
@@ -7771,9 +7768,8 @@ LogicalResult OpenMPDialectLLVMIRTranslationInterface::amendOperation(
if (auto filepathAttr = dyn_cast<StringAttr>(attr)) {
llvm::OpenMPIRBuilder *ompBuilder =
moduleTranslation.getOpenMPBuilder();
- auto VFS = llvm::vfs::getRealFileSystem();
- ompBuilder->loadOffloadInfoMetadata(*VFS,
- filepathAttr.getValue());
+ ompBuilder->loadOffloadInfoMetadata(
+ moduleTranslation.getFileSystem(), filepathAttr.getValue());
return success();
}
return failure();
diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
index f29e7f7caa698..6e235839ae770 100644
--- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
@@ -48,6 +48,7 @@
#include "llvm/IR/Verifier.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/VirtualFileSystem.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/Cloning.h"
@@ -780,14 +781,15 @@ llvm::Constant *mlir::LLVM::detail::getLLVMConstant(
}
ModuleTranslation::ModuleTranslation(Operation *module,
- std::unique_ptr<llvm::Module> llvmModule)
+ std::unique_ptr<llvm::Module> llvmModule,
+ llvm::vfs::FileSystem *fs)
: mlirModule(module), llvmModule(std::move(llvmModule)),
debugTranslation(
std::make_unique<DebugTranslation>(module, *this->llvmModule)),
loopAnnotationTranslation(std::make_unique<LoopAnnotationTranslation>(
*this, *this->llvmModule)),
typeTranslator(this->llvmModule->getContext()),
- iface(module->getContext()) {
+ iface(module->getContext()), fileSystem(fs) {
assert(satisfiesLLVMModule(mlirModule) &&
"mlirModule should honor LLVM's module semantics.");
}
@@ -2397,6 +2399,12 @@ llvm::OpenMPIRBuilder *ModuleTranslation::getOpenMPBuilder() {
return ompBuilder.get();
}
+llvm::vfs::FileSystem &ModuleTranslation::getFileSystem() {
+ if (fileSystem)
+ return *fileSystem;
+ return *llvm::vfs::getRealFileSystem();
+}
+
llvm::DILocation *ModuleTranslation::translateLoc(Location loc,
llvm::DILocalScope *scope) {
return debugTranslation->translateLoc(loc, scope);
@@ -2486,7 +2494,8 @@ prepareLLVMModule(Operation *m, llvm::LLVMContext &llvmContext,
std::unique_ptr<llvm::Module>
mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
- StringRef name, bool disableVerification) {
+ StringRef name, bool disableVerification,
+ llvm::vfs::FileSystem *fs) {
if (!satisfiesLLVMModule(module)) {
module->emitOpError("can not be translated to an LLVMIR module");
return nullptr;
@@ -2500,7 +2509,7 @@ mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
LLVM::ensureDistinctSuccessors(module);
LLVM::legalizeDIExpressionsRecursively(module);
- ModuleTranslation translator(module, std::move(llvmModule));
+ ModuleTranslation translator(module, std::move(llvmModule), fs);
llvm::IRBuilder<llvm::TargetFolder> llvmBuilder(
llvmContext,
llvm::TargetFolder(translator.getLLVMModule()->getDataLayout()));
``````````
</details>
https://github.com/llvm/llvm-project/pull/195319
More information about the Mlir-commits
mailing list