From c425c3823fbd475dc83211fef47f7ea58421ed17 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 7 May 2012 13:53:40 -0400 Subject: [PATCH] radeon/llvm: Remove references to DebugFlag and isCurrentDebugType() These weren't being used at all and they were causing build failures when LLVM was built with NDEBUG defined and mesa was not. https://bugs.freedesktop.org/show_bug.cgi?id=49110 --- src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp | 6 +----- src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp | 1 - src/gallium/drivers/radeon/AMDILMachinePeephole.cpp | 9 +-------- src/gallium/drivers/radeon/AMDILPeepholeOptimizer.cpp | 9 +-------- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp b/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp index 289af6f210e..91cd41179ab 100644 --- a/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp +++ b/src/gallium/drivers/radeon/AMDILCFGStructurizer.cpp @@ -7,12 +7,8 @@ // //==-----------------------------------------------------------------------===// -#define DEBUG_TYPE "structcfg" -#ifdef DEBUG -#define DEBUGME (DebugFlag && isCurrentDebugType(DEBUG_TYPE)) -#else #define DEBUGME 0 -#endif +#define DEBUG_TYPE "structcfg" #include "AMDILTargetMachine.h" #include "AMDILUtilityFunctions.h" diff --git a/src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp b/src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp index 9366f2e7bcb..ec33e78cfc5 100644 --- a/src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp +++ b/src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp @@ -9,7 +9,6 @@ // //===---------------------------------------------------------------------===// -#define DEBUG_TYPE "amdil-emitter" #include "AMDIL.h" #include "AMDILInstrInfo.h" #include "llvm/ADT/SmallVector.h" diff --git a/src/gallium/drivers/radeon/AMDILMachinePeephole.cpp b/src/gallium/drivers/radeon/AMDILMachinePeephole.cpp index b8e536361f0..7ae8d60106f 100644 --- a/src/gallium/drivers/radeon/AMDILMachinePeephole.cpp +++ b/src/gallium/drivers/radeon/AMDILMachinePeephole.cpp @@ -8,13 +8,6 @@ //==-----------------------------------------------------------------------===// -#define DEBUG_TYPE "machine_peephole" -#if !defined(NDEBUG) -#define DEBUGME (DebugFlag && isCurrentDebugType(DEBUG_TYPE)) -#else -#define DEBUGME (false) -#endif - #include "AMDIL.h" #include "AMDILSubtarget.h" #include "AMDILUtilityFunctions.h" @@ -56,7 +49,7 @@ namespace llvm AMDILMachinePeephole::AMDILMachinePeephole(TargetMachine &tm AMDIL_OPT_LEVEL_DECL) : MachineFunctionPass(ID), TM(tm) { - mDebug = DEBUGME; + mDebug = false; } bool diff --git a/src/gallium/drivers/radeon/AMDILPeepholeOptimizer.cpp b/src/gallium/drivers/radeon/AMDILPeepholeOptimizer.cpp index 5fe9f53c8c8..9005a39d6b3 100644 --- a/src/gallium/drivers/radeon/AMDILPeepholeOptimizer.cpp +++ b/src/gallium/drivers/radeon/AMDILPeepholeOptimizer.cpp @@ -7,13 +7,6 @@ // //==-----------------------------------------------------------------------===// -#define DEBUG_TYPE "PeepholeOpt" -#ifdef DEBUG -#define DEBUGME (DebugFlag && isCurrentDebugType(DEBUG_TYPE)) -#else -#define DEBUGME 0 -#endif - #include "AMDILAlgorithms.tpp" #include "AMDILDevices.h" #include "AMDILUtilityFunctions.h" @@ -134,7 +127,7 @@ namespace llvm { AMDILPeepholeOpt::AMDILPeepholeOpt(TargetMachine &tm AMDIL_OPT_LEVEL_DECL) : FunctionPass(ID), TM(tm) { - mDebug = DEBUGME; + mDebug = false; optLevel = TM.getOptLevel(); } -- 2.30.2