Replace ENABLE_CHECKING macro with flag_checking in HSA

	* hsa-gen.c (generate_hsa): Replace ENABLE_CHECKING macro
	with flag_checking.
	* hsa-regalloc.c (linear_scan_regalloc): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233736 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df10e1c..1801e13 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-26  Martin Liska  <mliska@suse.cz>
+
+       * hsa-gen.c (generate_hsa): Replace ENABLE_CHECKING macro
+       with flag_checking.
+       * hsa-regalloc.c (linear_scan_regalloc): Likewise.
+
 2016-02-26  Markus Trippelsdorf  <markus@trippelsdorf.de>
            Martin Liska  <mliska@suse.cz>
 

diff --git a/gcc/hsa-gen.c b/gcc/hsa-gen.c
index 28e8b6f..8e2144c 100644 (file)
--- a/gcc/hsa-gen.c
+++ b/gcc/hsa-gen.c
@@ -6091,21 +6091,22 @@ generate_hsa (bool kernel)
                                 s->m_gridified_kernel_p);
     }
 
-#ifdef ENABLE_CHECKING
-  for (unsigned i = 0; i < hsa_cfun->m_ssa_map.length (); i++)
-    if (hsa_cfun->m_ssa_map[i])
-      hsa_cfun->m_ssa_map[i]->verify_ssa ();
-
-  basic_block bb;
-  FOR_EACH_BB_FN (bb, cfun)
+  if (flag_checking)
     {
-      hsa_bb *hbb = hsa_bb_for_bb (bb);
+      for (unsigned i = 0; i < hsa_cfun->m_ssa_map.length (); i++)
+       if (hsa_cfun->m_ssa_map[i])
+         hsa_cfun->m_ssa_map[i]->verify_ssa ();
 
-      for (hsa_insn_basic *insn = hbb->m_first_insn; insn; insn = insn->m_next)
-       insn->verify ();
-    }
+      basic_block bb;
+      FOR_EACH_BB_FN (bb, cfun)
+       {
+         hsa_bb *hbb = hsa_bb_for_bb (bb);
 
-#endif
+         for (hsa_insn_basic *insn = hbb->m_first_insn; insn;
+              insn = insn->m_next)
+           insn->verify ();
+       }
+    }
 
   hsa_regalloc ();
   hsa_brig_emit_function ();

diff --git a/gcc/hsa-regalloc.c b/gcc/hsa-regalloc.c
index f8e83ec..9437132 100644 (file)
--- a/gcc/hsa-regalloc.c
+++ b/gcc/hsa-regalloc.c
@@ -580,10 +580,9 @@ linear_scan_regalloc (struct m_reg_class_desc *classes)
   /* Sort all intervals by increasing start point.  */
   gcc_assert (ind2reg.length () == (size_t) hsa_cfun->m_reg_count);
 
-#ifdef ENABLE_CHECKING
-  for (unsigned i = 0; i < ind2reg.length (); i++)
-    gcc_assert (ind2reg[i]);
-#endif
+  if (flag_checking)
+    for (unsigned i = 0; i < ind2reg.length (); i++)
+      gcc_assert (ind2reg[i]);
 
   ind2reg.qsort (cmp_begin);
   for (i = 0; i < 4; i++)