summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-11-18 19:43:44 +0000
committerTom Stellard <thomas.stellard@amd.com>2013-11-18 19:43:44 +0000
commitb570599c8f048c2eda78edb9304bd8e283fb6908 (patch)
tree4d644b14cfedf0f2ed2d0ee0e17d44321167fcad /lib
parent44248e0f631beec23db16fa62ddfd799492ea3ff (diff)
downloadllvm-b570599c8f048c2eda78edb9304bd8e283fb6908.tar.gz
llvm-b570599c8f048c2eda78edb9304bd8e283fb6908.tar.bz2
llvm-b570599c8f048c2eda78edb9304bd8e283fb6908.tar.xz
R600: Enable the IR structurizer by default
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195031 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/R600/AMDGPU.td6
-rw-r--r--lib/Target/R600/AMDGPUSubtarget.cpp2
-rw-r--r--lib/Target/R600/AMDGPUTargetMachine.cpp3
3 files changed, 5 insertions, 6 deletions
diff --git a/lib/Target/R600/AMDGPU.td b/lib/Target/R600/AMDGPU.td
index 37ff6b143a..182235b27c 100644
--- a/lib/Target/R600/AMDGPU.td
+++ b/lib/Target/R600/AMDGPU.td
@@ -21,10 +21,10 @@ def FeatureDumpCode : SubtargetFeature <"DumpCode",
"true",
"Dump MachineInstrs in the CodeEmitter">;
-def FeatureIRStructurizer : SubtargetFeature <"enable-irstructurizer",
+def FeatureIRStructurizer : SubtargetFeature <"disable-irstructurizer",
"EnableIRStructurizer",
- "true",
- "Enable IR Structurizer">;
+ "false",
+ "Disable IR Structurizer">;
// Target features
diff --git a/lib/Target/R600/AMDGPUSubtarget.cpp b/lib/Target/R600/AMDGPUSubtarget.cpp
index 4e97e6e83b..061793a68b 100644
--- a/lib/Target/R600/AMDGPUSubtarget.cpp
+++ b/lib/Target/R600/AMDGPUSubtarget.cpp
@@ -36,7 +36,7 @@ AMDGPUSubtarget::AMDGPUSubtarget(StringRef TT, StringRef CPU, StringRef FS) :
Gen = AMDGPUSubtarget::R600;
FP64 = false;
CaymanISA = false;
- EnableIRStructurizer = false;
+ EnableIRStructurizer = true;
EnableIfCvt = true;
ParseSubtargetFeatures(GPU, FS);
DevName = GPU;
diff --git a/lib/Target/R600/AMDGPUTargetMachine.cpp b/lib/Target/R600/AMDGPUTargetMachine.cpp
index 9186c9df3a..bc4f5d720a 100644
--- a/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -125,8 +125,7 @@ bool
AMDGPUPassConfig::addPreISel() {
const AMDGPUSubtarget &ST = TM->getSubtarget<AMDGPUSubtarget>();
addPass(createFlattenCFGPass());
- if (ST.IsIRStructurizerEnabled() ||
- ST.getGeneration() > AMDGPUSubtarget::NORTHERN_ISLANDS)
+ if (ST.IsIRStructurizerEnabled())
addPass(createStructurizeCFGPass());
if (ST.getGeneration() > AMDGPUSubtarget::NORTHERN_ISLANDS) {
addPass(createSinkingPass());