From: Richard Biener <rguenther@suse.de>
Date: Thu, 23 Feb 2023 10:03:03 +0000 (+0100)
Subject: tree-optimization/108888 - call if-conversion
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974ca5fa871c694b71c55c4da13cc084608e0eaf;p=thirdparty%2Fgcc.git

tree-optimization/108888 - call if-conversion

The following makes sure to only predicate calls necessary.

	PR tree-optimization/108888
	* tree-if-conv.cc (if_convertible_stmt_p): Set PLF_2 on
	calls to predicate.
	(predicate_statements): Only predicate calls with PLF_2.

	* g++.dg/torture/pr108888.C: New testcase.

(cherry picked from commit 31cc5821223a096ef61743bff520f4a0dbba5872)
---

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 77bc463a2c85..c1da700805c4 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,11 @@
+2023-02-23  Andrew Stubbs  <ams@codesourcery.com>
+
+	Backport from mainline:
+	PR tree-optimization/108888
+	* tree-if-conv.cc (if_convertible_stmt_p): Set PLF_2 on
+	calls to predicate.
+	(predicate_statements): Only predicate calls with PLF_2.
+
 2023-02-23  Andrew Stubbs  <ams@codesourcery.com>
 
 	* internal-fn.cc (expand_MASK_CALL): New.
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index d3c93a0fd23c..98e416876337 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,8 @@
+2023-02-23  Andrew Stubbs  <ams@codesourcery.com>
+
+	Backport from mainline:
+	* g++.dg/torture/pr108888.C: New testcase.
+
 2023-02-23  Andrew Stubbs  <ams@codesourcery.com>
 
 	* gcc.dg/vect/vect-simd-clone-16.c: New test.
diff --git a/gcc/testsuite/g++.dg/torture/pr108888.C b/gcc/testsuite/g++.dg/torture/pr108888.C
new file mode 100644
index 000000000000..29a22e211026
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr108888.C
@@ -0,0 +1,18 @@
+// { dg-do compile }
+
+int scaleValueSaturate_scalefactor, scaleValueSaturate___trans_tmp_2,
+    scaleValuesSaturate_i;
+int scaleValueSaturate(int value) {
+  int result = __builtin_clz(value);
+  if (value)
+    if (-result <= scaleValueSaturate_scalefactor)
+      return 0;
+  return scaleValueSaturate___trans_tmp_2;
+}
+short scaleValuesSaturate_dst;
+short *scaleValuesSaturate_src;
+void scaleValuesSaturate() {
+  for (; scaleValuesSaturate_i; scaleValuesSaturate_i++)
+    scaleValuesSaturate_dst =
+        scaleValueSaturate(scaleValuesSaturate_src[scaleValuesSaturate_i]);
+}
diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc
index e0c2db745c1e..16da1dc8df28 100644
--- a/gcc/tree-if-conv.cc
+++ b/gcc/tree-if-conv.cc
@@ -1106,6 +1106,7 @@ if_convertible_stmt_p (gimple *stmt, vec<data_reference_p> refs)
 		   n = n->simdclone->next_clone)
 		if (n->simdclone->inbranch)
 		  {
+		    gimple_set_plf (stmt, GF_PLF_2, true);
 		    need_to_predicate = true;
 		    return true;
 		  }
@@ -2559,7 +2560,8 @@ predicate_statements (loop_p loop)
 	      release_defs (stmt);
 	      continue;
 	    }
-	  else if (gimple_plf (stmt, GF_PLF_2))
+	  else if (gimple_plf (stmt, GF_PLF_2)
+		   && is_gimple_assign (stmt))
 	    {
 	      tree lhs = gimple_assign_lhs (stmt);
 	      tree mask;
@@ -2644,13 +2646,14 @@ predicate_statements (loop_p loop)
 	      gimple_assign_set_rhs1 (stmt, ifc_temp_var (type, rhs, &gsi));
 	      update_stmt (stmt);
 	    }
-
-	  /* Convert functions that have a SIMD clone to IFN_MASK_CALL.  This
-	     will cause the vectorizer to match the "in branch" clone variants,
-	     and serves to build the mask vector in a natural way.  */
-	  gcall *call = dyn_cast <gcall *> (gsi_stmt (gsi));
-	  if (call && !gimple_call_internal_p (call))
+	  else if (gimple_plf (stmt, GF_PLF_2)
+		   && is_gimple_call (stmt))
 	    {
+	      /* Convert functions that have a SIMD clone to IFN_MASK_CALL.
+		 This will cause the vectorizer to match the "in branch"
+		 clone variants, and serves to build the mask vector
+		 in a natural way.  */
+	      gcall *call = dyn_cast <gcall *> (gsi_stmt (gsi));
 	      tree orig_fn = gimple_call_fn (call);
 	      int orig_nargs = gimple_call_num_args (call);
 	      auto_vec<tree> args;