[llvm] 267708f - [MachineOutliner] Add IsOutlined to MachineFunction
via llvm-commits
llvm-commits at lists.llvm.org
Sun Apr 9 19:57:59 PDT 2023
Author: wangpc
Date: 2023-04-10T10:57:29+08:00
New Revision: 267708f9d5150c5153e92e913c021918b790ac4f
URL: https://github.com/llvm/llvm-project/commit/267708f9d5150c5153e92e913c021918b790ac4f
DIFF: https://github.com/llvm/llvm-project/commit/267708f9d5150c5153e92e913c021918b790ac4f.diff
LOG: [MachineOutliner] Add IsOutlined to MachineFunction
We add a field `IsOutlined` to indicate whether a MachineFunction
is outlined and set it true for outlined functions in MachineOutliner.
Reviewed By: paquette
Differential Revision: https://reviews.llvm.org/D146191
Added:
Modified:
llvm/include/llvm/CodeGen/MIRYamlMapping.h
llvm/include/llvm/CodeGen/MachineFunction.h
llvm/lib/CodeGen/MIRParser/MIRParser.cpp
llvm/lib/CodeGen/MIRPrinter.cpp
llvm/lib/CodeGen/MachineOutliner.cpp
llvm/test/CodeGen/RISCV/machineoutliner.mir
llvm/tools/llvm-reduce/ReducerWorkItem.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/CodeGen/MIRYamlMapping.h b/llvm/include/llvm/CodeGen/MIRYamlMapping.h
index 62911c2bd7411..80557e0feb77f 100644
--- a/llvm/include/llvm/CodeGen/MIRYamlMapping.h
+++ b/llvm/include/llvm/CodeGen/MIRYamlMapping.h
@@ -704,6 +704,7 @@ struct MachineFunction {
bool HasEHCatchret = false;
bool HasEHScopes = false;
bool HasEHFunclets = false;
+ bool IsOutlined = false;
bool FailsVerification = false;
bool TracksDebugUserValues = false;
@@ -742,6 +743,7 @@ template <> struct MappingTraits<MachineFunction> {
YamlIO.mapOptional("hasEHCatchret", MF.HasEHCatchret, false);
YamlIO.mapOptional("hasEHScopes", MF.HasEHScopes, false);
YamlIO.mapOptional("hasEHFunclets", MF.HasEHFunclets, false);
+ YamlIO.mapOptional("isOutlined", MF.IsOutlined, false);
YamlIO.mapOptional("debugInstrRef", MF.UseDebugInstrRef, false);
YamlIO.mapOptional("failsVerification", MF.FailsVerification, false);
diff --git a/llvm/include/llvm/CodeGen/MachineFunction.h b/llvm/include/llvm/CodeGen/MachineFunction.h
index b83ccc32e438a..3e22c397ae3c3 100644
--- a/llvm/include/llvm/CodeGen/MachineFunction.h
+++ b/llvm/include/llvm/CodeGen/MachineFunction.h
@@ -374,6 +374,7 @@ class LLVM_EXTERNAL_VISIBILITY MachineFunction {
bool HasEHCatchret = false;
bool HasEHScopes = false;
bool HasEHFunclets = false;
+ bool IsOutlined = false;
/// BBID to assign to the next basic block of this function.
unsigned NextBBID = 0;
@@ -1116,6 +1117,9 @@ class LLVM_EXTERNAL_VISIBILITY MachineFunction {
bool hasEHFunclets() const { return HasEHFunclets; }
void setHasEHFunclets(bool V) { HasEHFunclets = V; }
+ bool isOutlined() const { return IsOutlined; }
+ void setIsOutlined(bool V) { IsOutlined = V; }
+
/// Find or create an LandingPadInfo for the specified MachineBasicBlock.
LandingPadInfo &getOrCreateLandingPadInfo(MachineBasicBlock *LandingPad);
diff --git a/llvm/lib/CodeGen/MIRParser/MIRParser.cpp b/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
index a20c2bfe6c0fd..4fffd628f1e6e 100644
--- a/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
+++ b/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
@@ -468,6 +468,7 @@ MIRParserImpl::initializeMachineFunction(const yaml::MachineFunction &YamlMF,
MF.setHasEHCatchret(YamlMF.HasEHCatchret);
MF.setHasEHScopes(YamlMF.HasEHScopes);
MF.setHasEHFunclets(YamlMF.HasEHFunclets);
+ MF.setIsOutlined(YamlMF.IsOutlined);
if (YamlMF.Legalized)
MF.getProperties().set(MachineFunctionProperties::Property::Legalized);
diff --git a/llvm/lib/CodeGen/MIRPrinter.cpp b/llvm/lib/CodeGen/MIRPrinter.cpp
index 0a4b28ac79a73..e2031e12edbea 100644
--- a/llvm/lib/CodeGen/MIRPrinter.cpp
+++ b/llvm/lib/CodeGen/MIRPrinter.cpp
@@ -200,6 +200,7 @@ void MIRPrinter::print(const MachineFunction &MF) {
YamlMF.HasEHCatchret = MF.hasEHCatchret();
YamlMF.HasEHScopes = MF.hasEHScopes();
YamlMF.HasEHFunclets = MF.hasEHFunclets();
+ YamlMF.IsOutlined = MF.isOutlined();
YamlMF.UseDebugInstrRef = MF.useDebugInstrRef();
YamlMF.Legalized = MF.getProperties().hasProperty(
diff --git a/llvm/lib/CodeGen/MachineOutliner.cpp b/llvm/lib/CodeGen/MachineOutliner.cpp
index d116c5445e307..74f4165a2ef72 100644
--- a/llvm/lib/CodeGen/MachineOutliner.cpp
+++ b/llvm/lib/CodeGen/MachineOutliner.cpp
@@ -725,6 +725,7 @@ MachineFunction *MachineOutliner::createOutlinedFunction(
MachineModuleInfo &MMI = getAnalysis<MachineModuleInfoWrapperPass>().getMMI();
MachineFunction &MF = MMI.getOrCreateMachineFunction(*F);
+ MF.setIsOutlined(true);
MachineBasicBlock &MBB = *MF.CreateMachineBasicBlock();
// Insert the new function into the module.
diff --git a/llvm/test/CodeGen/RISCV/machineoutliner.mir b/llvm/test/CodeGen/RISCV/machineoutliner.mir
index e629a626e3d13..3a2d506287253 100644
--- a/llvm/test/CodeGen/RISCV/machineoutliner.mir
+++ b/llvm/test/CodeGen/RISCV/machineoutliner.mir
@@ -1,7 +1,7 @@
# RUN: llc -march=riscv32 -x mir -run-pass=machine-outliner -simplify-mir -verify-machineinstrs < %s \
-# RUN: | FileCheck -check-prefix=RV32I-MO %s
+# RUN: | FileCheck -check-prefixes=CHECK,RV32I-MO %s
# RUN: llc -march=riscv64 -x mir -run-pass=machine-outliner -simplify-mir -verify-machineinstrs < %s \
-# RUN: | FileCheck -check-prefix=RV64I-MO %s
+# RUN: | FileCheck -check-prefixes=CHECK,RV64I-MO %s
--- |
define i32 @outline_0(i32 %a, i32 %b) { ret i32 0 }
@@ -24,6 +24,7 @@
---
name: outline_0
tracksRegLiveness: true
+isOutlined: false
body: |
bb.0:
liveins: $x10, $x11
@@ -42,6 +43,7 @@ body: |
---
name: outline_1
tracksRegLiveness: true
+isOutlined: false
body: |
bb.0:
liveins: $x10, $x11
@@ -60,6 +62,7 @@ body: |
---
name: outline_2
tracksRegLiveness: true
+isOutlined: false
body: |
bb.0:
liveins: $x10, $x11
@@ -78,6 +81,7 @@ body: |
---
name: dont_outline_0
tracksRegLiveness: true
+isOutlined: false
body: |
bb.0:
liveins: $x10, $x11
@@ -96,6 +100,7 @@ body: |
---
name: dont_outline_1
tracksRegLiveness: true
+isOutlined: false
body: |
bb.0:
liveins: $x10, $x11
@@ -114,6 +119,7 @@ body: |
---
name: dont_outline_2
tracksRegLiveness: true
+isOutlined: false
body: |
bb.0:
liveins: $x10, $x11, $x5
@@ -130,3 +136,6 @@ body: |
PseudoRET implicit $x10
...
+
+# CHECK-LABEL: name: OUTLINED_FUNCTION_0
+# CHECK: isOutlined: true
diff --git a/llvm/tools/llvm-reduce/ReducerWorkItem.cpp b/llvm/tools/llvm-reduce/ReducerWorkItem.cpp
index d09655fc69919..25382d8ab3d12 100644
--- a/llvm/tools/llvm-reduce/ReducerWorkItem.cpp
+++ b/llvm/tools/llvm-reduce/ReducerWorkItem.cpp
@@ -372,6 +372,7 @@ static std::unique_ptr<MachineFunction> cloneMF(MachineFunction *SrcMF,
DstMF->setHasEHCatchret(SrcMF->hasEHCatchret());
DstMF->setHasEHScopes(SrcMF->hasEHScopes());
DstMF->setHasEHFunclets(SrcMF->hasEHFunclets());
+ DstMF->setIsOutlined(SrcMF->isOutlined());
if (!SrcMF->getLandingPads().empty() ||
!SrcMF->getCodeViewAnnotations().empty() ||
More information about the llvm-commits
mailing list