From e2da2f7205e03a57f5f0a6b75974bcab39fe6b9e Mon Sep 17 00:00:00 2001
From: Giuliano Belinassi <giuliano.belinassi@usp.br>
Date: Sun, 24 Jan 2021 12:29:42 -0300
Subject: Initial commit for Europar 2021 GCC version

This was the version of GCC used in the Europar 2021 paper with regard
to GCC paralelism. Future commits are possible, so look in the paper the
commit hash of the version was used.
---
 gcc/.cgraphunit.c.swp | Bin 0 -> 126976 bytes
 gcc/.lto-cgraph.c.swo | Bin 0 -> 16384 bytes
 gcc/cgraphunit.c      |  12 ++++++++++++
 gcc/gcc.c             |   9 +--------
 gcc/ipa-split.c       |  17 +++++++++++++----
 5 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 gcc/.cgraphunit.c.swp
 create mode 100644 gcc/.lto-cgraph.c.swo

diff --git a/gcc/.cgraphunit.c.swp b/gcc/.cgraphunit.c.swp
new file mode 100644
index 0000000..83c78e6
Binary files /dev/null and b/gcc/.cgraphunit.c.swp differ
diff --git a/gcc/.lto-cgraph.c.swo b/gcc/.lto-cgraph.c.swo
new file mode 100644
index 0000000..a87c6db
Binary files /dev/null and b/gcc/.lto-cgraph.c.swo differ
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 73e4bed..12d2d19 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2794,10 +2794,22 @@ maybe_compile_in_parallel (void)
   bool jobserver = false;
   bool job_auto = false;
   int num_jobs = -1;
+  unsigned long long insns = 0;
+  cgraph_node *cnode;
 
   if (!flag_parallel_jobs || !split_outputs)
     return false;
 
+  FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (cnode)
+    {
+      ipa_size_summary *ss = ipa_size_summaries->get (cnode);
+      if (!cnode->inlined_to && ss)
+	insns += ss->size;
+    }
+
+  if (insns < (unsigned long long) param_min_partition_size)
+    return false;
+
   if (!strcmp (flag_parallel_jobs, "auto"))
     {
       jobserver = jobserver_initialize ();
diff --git a/gcc/gcc.c b/gcc/gcc.c
index c276a11..ba942c0 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3405,14 +3405,7 @@ append_split_outputs (extra_arg_storer *storer,
 	  argv[argc++] = extra_argument;
 	}
 
-      if (have_c)
-	{
-	  argv[argc++] = "-fPIE";
-	  argv[argc++] = "-fPIC";
-	}
-
       argv[argc]   = NULL;
-
       commands[0].argv = argv;
     }
 
@@ -3977,7 +3970,7 @@ execute (void)
   /* FIXME: Interact with GNU Jobserver if necessary.  */
 
   commands_batch = commands;
-  n = flag_parallel_jobs? 1: n_commands;
+  n = n_commands;
 
   for (int i = 0; i < n_commands; i += n)
     {
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 973e72c..09e9eb9 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -1909,8 +1909,12 @@ pass_split_functions::gate (function *)
 {
   /* When doing profile feedback, we want to execute the pass after profiling
      is read.  So disable one in early optimization.  */
-  return (flag_partial_inlining
-	  && !profile_arc_flag && !flag_branch_probabilities);
+
+  /* Disabled due to an issue regarding how the partitioner applier
+     handle clones generated by this pass.  */
+  /*return (flag_partial_inlining
+	  && !profile_arc_flag && !flag_branch_probabilities); */
+  return false;
 }
 
 } // anon namespace
@@ -1968,8 +1972,13 @@ pass_feedback_split_functions::gate (function *)
 {
   /* We don't need to split when profiling at all, we are producing
      lousy code anyway.  */
-  return (flag_partial_inlining
-	  && flag_branch_probabilities);
+
+  /* Disabled due to an issue regarding how the partitioner applier
+     handle clones generated by this pass.  */
+  /* return (flag_partial_inlining
+	  && flag_branch_probabilities); */
+
+  return false;
 }
 
 } // anon namespace
-- 
cgit v1.1