Mesa (master): radeon/llvm: Remove references to DebugFlag and isCurrentDebugType()

Tom Stellard tstellar at kemper.freedesktop.org
Mon May 7 19:10:06 UTC 2012


Module: Mesa
Branch: master
Commit: c425c3823fbd475dc83211fef47f7ea58421ed17
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c425c3823fbd475dc83211fef47f7ea58421ed17

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Mon May  7 13:53:40 2012 -0400

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

---

 .../drivers/radeon/AMDILCFGStructurizer.cpp        |    6 +-----
 src/gallium/drivers/radeon/AMDILMCCodeEmitter.cpp  |    1 -
 .../drivers/radeon/AMDILMachinePeephole.cpp        |    9 +--------
 .../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 289af6f..91cd411 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 9366f2e..ec33e78 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 b8e5363..7ae8d60 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 5fe9f53..9005a39 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();
 
 }




More information about the mesa-commit mailing list