P4 to Git Change 1184767 by lmoriche@lmoriche_opencl_dev on 2015/08/26 13:54:18
ECR #304775 - Remove the complib oclutils Affected files ... ... //depot/stg/opencl/drivers/opencl/Makefile#52 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/Makefile#36 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile.complib#92 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#43 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/Makefile#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/build/Makefile#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/build/Makefile.oclutils#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/alloc.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/alloc.hpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/os.cpp#6 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/os.hpp#7 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/os_posix.cpp#11 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/os_win32.cpp#6 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/setjmp.S#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/os/setjmp.asm#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/atomic.hpp#5 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/monitor.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/monitor.hpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/semaphore.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/semaphore.hpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/thread.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/thread/thread.hpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/top.hpp#6 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/utils/debug.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/utils/debug.hpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/utils/macros.hpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/promotions/oclutils/utils/util.hpp#3 delete ... //depot/stg/opencl/drivers/opencl/runtime/Makefile#19 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/debug.cpp#4 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/debug.hpp#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#238 edit
This commit is contained in:
@@ -30,16 +30,6 @@ breakpoint(void)
|
||||
}
|
||||
//! \endcond
|
||||
|
||||
bool
|
||||
ShouldBreak(LogLevel level)
|
||||
{
|
||||
if ((level == LOG_WARNING && BREAK_ON_LOG_WARNING)
|
||||
|| (level == LOG_ERROR && BREAK_ON_LOG_ERROR)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void
|
||||
report_fatal(const char* file, int line, const char* message)
|
||||
{
|
||||
|
||||
@@ -108,21 +108,12 @@ warning(const char* msg)
|
||||
# define Untested(msg) (void)(0)
|
||||
#endif /*NDEBUG*/
|
||||
|
||||
#ifdef DEBUG
|
||||
namespace amd {
|
||||
extern bool ShouldBreak(LogLevel level);
|
||||
} // namespace amd
|
||||
#endif // DEBUG
|
||||
|
||||
#ifdef DEBUG
|
||||
# define Log(level,msg) \
|
||||
do \
|
||||
{ \
|
||||
if (LOG_LEVEL >= level) { \
|
||||
amd::log_entry(level, __FILE__, __LINE__, msg); \
|
||||
if (amd::ShouldBreak(level)) { \
|
||||
amd::breakpoint(); \
|
||||
} \
|
||||
} \
|
||||
} while (false)
|
||||
#else // !DEBUG
|
||||
@@ -135,9 +126,6 @@ do \
|
||||
{ \
|
||||
if (LOG_LEVEL >= level) { \
|
||||
amd::log_timestamped(level, __FILE__, __LINE__, msg); \
|
||||
if (amd::ShouldBreak(level)) { \
|
||||
amd::breakpoint(); \
|
||||
} \
|
||||
} \
|
||||
} while (false)
|
||||
#else // !DEBUG
|
||||
@@ -150,9 +138,6 @@ do \
|
||||
{ \
|
||||
if (LOG_LEVEL >= level) { \
|
||||
amd::log_printf(level, __FILE__, __LINE__, format, __VA_ARGS__); \
|
||||
if (amd::ShouldBreak(level)) { \
|
||||
amd::breakpoint(); \
|
||||
} \
|
||||
} \
|
||||
} while (false)
|
||||
#else // !DEBUG
|
||||
|
||||
@@ -10,10 +10,6 @@
|
||||
\
|
||||
debug(int, LOG_LEVEL, 0, \
|
||||
"The default log level") \
|
||||
debug(bool, BREAK_ON_LOG_WARNING, false, \
|
||||
"Break each time an error is logged") \
|
||||
debug(bool, BREAK_ON_LOG_ERROR, false, \
|
||||
"Break each time an error is logged") \
|
||||
debug(uint, DEBUG_GPU_FLAGS, 0, \
|
||||
"The debug options for GPU device") \
|
||||
debug(uint, GPU_MAX_COMMAND_QUEUES, 70, \
|
||||
|
||||
Reference in New Issue
Block a user