radeon/llvm: Disable SI flow control again for now.

[mesa.git] / src / gallium / drivers / radeon / AMDGPUTargetMachine.cpp

diff --git a/src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp b/src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp
index 2d1ca0689051a2c4702cbe799e774294804104c7..bfe9d81303baaeaf040d2c01d60381b9b9a5c031 100644 (file)
--- a/src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp
+++ b/src/gallium/drivers/radeon/AMDGPUTargetMachine.cpp
@@ -95,11 +95,6 @@ TargetPassConfig *AMDGPUTargetMachine::createPassConfig(PassManagerBase &PM) {
 bool
 AMDGPUPassConfig::addPreISel()
 {
-  const AMDGPUSubtarget &ST = TM->getSubtarget<AMDGPUSubtarget>();
-  if (ST.device()->getGeneration() <= AMDGPUDeviceInfo::HD6XXX) {
-    PM->add(createR600KernelParametersPass(
-                     getAMDGPUTargetMachine().getTargetData()));
-  }
   return false;
 }
 
@@ -139,6 +134,8 @@ bool AMDGPUPassConfig::addPreEmitPass() {
     addPass(FinalizeMachineBundlesID);
   } else {
     PM->add(createSILowerLiteralConstantsPass(*TM));
+    // piglit is unreliable (VM protection faults, GPU lockups) with this pass:
+    //PM->add(createSILowerFlowControlPass(*TM));
   }
 
   return false;