-
Notifications
You must be signed in to change notification settings - Fork 110
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.
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
[CIR][TargetLowering][NFC] Refactor LowerModule to a unified global state #759
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
clang/include/clang/CIR/Dialect/Transforms/TargetLowering/LowerModuleRegistry.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
//===- LowerModuleRegistry.h - LowerModule singleton registry ---*- 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 header file defines the registry of LowerModule so that it can be easily | ||
// accessed from other libraries. | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#ifndef CLANG_CIR_DIALECT_TRANSFORMS_TARGETLOWERING_LOWERMODULEREGISTRY_H | ||
#define CLANG_CIR_DIALECT_TRANSFORMS_TARGETLOWERING_LOWERMODULEREGISTRY_H | ||
|
||
#include "mlir/IR/BuiltinOps.h" | ||
#include "mlir/IR/PatternMatch.h" | ||
#include "mlir/Pass/Pass.h" | ||
|
||
namespace mlir { | ||
namespace cir { | ||
|
||
class LowerModule; | ||
|
||
/// Registry for the LowerModule, enabling easy access to the LowerModule from | ||
/// various libraries. | ||
class LowerModuleRegistry { | ||
std::unique_ptr<LowerModule> lowerModule; | ||
std::optional<PatternRewriter> rewriter; | ||
|
||
public: | ||
/// Initialize the LowerModuleRegistry with the given module and an internal | ||
/// rewriter. | ||
void initializeWithModule(ModuleOp module); | ||
|
||
/// Check if the LowerModuleRegistry has been initialized. | ||
bool isInitialized() { return lowerModule != nullptr; } | ||
|
||
/// Get the reference to already-initialized LowerModule. | ||
LowerModule &get() { | ||
assert(isInitialized() && "LowerModuleRegistry not initialized"); | ||
return *lowerModule; | ||
} | ||
|
||
/// Get the LowerModuleRegistry singleton. | ||
static LowerModuleRegistry &instance(); | ||
}; | ||
|
||
} // namespace cir | ||
} // namespace mlir | ||
|
||
#endif // CLANG_CIR_DIALECT_TRANSFORMS_TARGETLOWERING_LOWERMODULEREGISTRY_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
clang/lib/CIR/Dialect/Transforms/TargetLowering/LowerModuleRegistry.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
//===- LowerModuleRegistry.cpp - LowerModule singleton registry -----------===// | ||
// | ||
// 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 file implements the registry of LowerModule so that it can be easily | ||
// accessed from other libraries. | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
// FIXME(cir): This header file is not exposed to the public API, but can be | ||
// reused by CIR ABI lowering since it holds target-specific information. | ||
#include "clang/CIR/Dialect/Transforms/TargetLowering/LowerModuleRegistry.h" | ||
#include "../../../../Basic/Targets.h" | ||
#include "LowerModule.h" | ||
#include "mlir/Dialect/LLVMIR/LLVMDialect.h" | ||
|
||
namespace mlir { | ||
namespace cir { | ||
|
||
void LowerModuleRegistry::initializeWithModule(ModuleOp module) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Migrated from the removed function |
||
assert(!isInitialized() && "LowerModuleRegistry already initialized"); | ||
// Create a new rewriter. | ||
rewriter.emplace(module->getContext()); | ||
// Fetch the LLVM data layout string. | ||
auto dataLayoutStr = cast<StringAttr>( | ||
module->getAttr(LLVM::LLVMDialect::getDataLayoutAttrName())); | ||
|
||
// Fetch target information. | ||
llvm::Triple triple( | ||
cast<StringAttr>(module->getAttr("cir.triple")).getValue()); | ||
clang::TargetOptions targetOptions; | ||
targetOptions.Triple = triple.str(); | ||
auto targetInfo = clang::targets::AllocateTarget(triple, targetOptions); | ||
|
||
// FIXME(cir): This just uses the default language options. We need to account | ||
// for custom options. | ||
// Create context. | ||
assert(!::cir::MissingFeatures::langOpts()); | ||
clang::LangOptions langOpts; | ||
|
||
lowerModule = std::make_unique<LowerModule>(langOpts, module, dataLayoutStr, | ||
std::move(targetInfo), *rewriter); | ||
} | ||
|
||
LowerModuleRegistry &LowerModuleRegistry::instance() { | ||
static llvm::ManagedStatic<LowerModuleRegistry> lowerModuleRegistry; | ||
return *lowerModuleRegistry; | ||
} | ||
|
||
} // namespace cir | ||
} // namespace mlir |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about the naming here. Advice welcome.