Skip to content

Commit f01c9f6

Browse files
committed
[AMDGPU] SelectionDAG divergence tracking. SelectionDAG unittests fixed.
1 parent 1774d96 commit f01c9f6

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

llvm/unittests/CodeGen/SelectionDAGAddressAnalysisTest.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "llvm/CodeGen/SelectionDAGAddressAnalysis.h"
1010
#include "llvm/Analysis/MemoryLocation.h"
1111
#include "llvm/Analysis/OptimizationRemarkEmitter.h"
12+
#include "llvm/Analysis/TargetTransformInfo.h"
1213
#include "llvm/AsmParser/Parser.h"
1314
#include "llvm/CodeGen/MachineModuleInfo.h"
1415
#include "llvm/CodeGen/SelectionDAG.h"
@@ -78,8 +79,12 @@ class SelectionDAGAddressAnalysisTest : public testing::Test {
7879
if (!DAG)
7980
report_fatal_error("DAG?");
8081
OptimizationRemarkEmitter ORE(F);
82+
FunctionAnalysisManager FAM;
83+
FAM.registerPass([&] { return TM->getTargetIRAnalysis(); });
84+
85+
TargetTransformInfo &TTI = FAM.getResult<TargetIRAnalysis>(*F);
8186
DAG->init(*MF, ORE, nullptr, nullptr, nullptr, nullptr, nullptr, MMI,
82-
nullptr);
87+
nullptr, TTI.hasBranchDivergence());
8388
}
8489

8590
TargetLoweringBase::LegalizeTypeAction getTypeAction(EVT VT) {

llvm/unittests/CodeGen/SelectionDAGPatternMatchTest.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "llvm/Analysis/OptimizationRemarkEmitter.h"
10+
#include "llvm/Analysis/TargetTransformInfo.h"
1011
#include "llvm/AsmParser/Parser.h"
1112
#include "llvm/CodeGen/MachineModuleInfo.h"
1213
#include "llvm/CodeGen/SDPatternMatch.h"
@@ -76,8 +77,12 @@ class SelectionDAGPatternMatchTest : public testing::Test {
7677
if (!DAG)
7778
report_fatal_error("DAG?");
7879
OptimizationRemarkEmitter ORE(F);
80+
FunctionAnalysisManager FAM;
81+
FAM.registerPass([&] { return TM->getTargetIRAnalysis(); });
82+
83+
TargetTransformInfo &TTI = FAM.getResult<TargetIRAnalysis>(*F);
7984
DAG->init(*MF, ORE, nullptr, nullptr, nullptr, nullptr, nullptr, MMI,
80-
nullptr);
85+
nullptr, TTI.hasBranchDivergence());
8186
}
8287

8388
TargetLoweringBase::LegalizeTypeAction getTypeAction(EVT VT) {

0 commit comments

Comments
 (0)