Added options to enable and disable log messages

jrprice · Jun 22, 2015 · 9081f6f · 9081f6f
1 parent a6045d9
commit 9081f6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/core/common.h b/src/core/common.h
@@ -85,14 +85,15 @@ namespace oclgrind
     OCLGRIND_INFO = 1,
     OCLGRIND_WARNING = 2,
     OCLGRIND_ERROR = 3,
+    // Special warning types
+    OCLGRIND_WARNING_UNINITIALIZED = OCLGRIND_WARNING + 4,
     // Special error types
     OCLGRIND_ERROR_DIVERGENCE = OCLGRIND_ERROR + 4,
     OCLGRIND_ERROR_INVALID_ACCESS = OCLGRIND_ERROR + 8,
     OCLGRIND_ERROR_DATA_RACE = OCLGRIND_ERROR + 12,
-    OCLGRIND_ERROR_UNINITIALIZED = OCLGRIND_ERROR + 16,
-    OCLGRIND_ERROR_UNALIGNED = OCLGRIND_ERROR + 20,
-    OCLGRIND_ERROR_ARRAY_BOUNDS = OCLGRIND_ERROR + 24,
-    OCLGRIND_ERROR_FATAL = OCLGRIND_ERROR + 28,
+    OCLGRIND_ERROR_UNALIGNED = OCLGRIND_ERROR + 16,
+    OCLGRIND_ERROR_ARRAY_BOUNDS = OCLGRIND_ERROR + 20,
+    OCLGRIND_ERROR_FATAL = OCLGRIND_ERROR + 24,
   };
 
   // 3-dimensional size

diff --git a/src/plugins/Logger.cpp b/src/plugins/Logger.cpp
@@ -110,10 +110,10 @@ void Logger::enableAllDiagnostics()
   enableDiagnosticOption(OCLGRIND_WARNING);
   enableDiagnosticOption(OCLGRIND_ERROR);
   // Turn on specific groups
+  enableDiagnosticOption(OCLGRIND_WARNING_UNINITIALIZED);
   enableDiagnosticOption(OCLGRIND_ERROR_DIVERGENCE);
   enableDiagnosticOption(OCLGRIND_ERROR_INVALID_ACCESS);
   enableDiagnosticOption(OCLGRIND_ERROR_DATA_RACE);
-  enableDiagnosticOption(OCLGRIND_ERROR_UNINITIALIZED);
   enableDiagnosticOption(OCLGRIND_ERROR_UNALIGNED);
   enableDiagnosticOption(OCLGRIND_ERROR_ARRAY_BOUNDS);
 }
@@ -185,6 +185,10 @@ bool Logger::parseDiagnosticOptions(char *options)
     {
       enableDiagnosticOption(OCLGRIND_DEBUG, isPositive);
     }
+    else if (!strcmp(opt_type, "uninitialized"))
+    {
+      enableDiagnosticOption(OCLGRIND_WARNING_UNINITIALIZED, isPositive);
+    }
     else if (!strcmp(opt_type, "divergence"))
     {
       enableDiagnosticOption(OCLGRIND_ERROR_DIVERGENCE, isPositive);
@@ -197,10 +201,6 @@ bool Logger::parseDiagnosticOptions(char *options)
     {
       enableDiagnosticOption(OCLGRIND_ERROR_DATA_RACE, isPositive);
     }
-    else if (!strcmp(opt_type, "uninitialized"))
-    {
-      enableDiagnosticOption(OCLGRIND_ERROR_UNINITIALIZED, isPositive);
-    }
     else if (!strcmp(opt_type, "unaligned"))
     {
       enableDiagnosticOption(OCLGRIND_ERROR_UNALIGNED, isPositive);