[lipo] merge from trunk

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 163718:170935, committed as revision 172131.

Tested spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 162000:163718, committed as revision 163901.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 160330:162000, committed as revision 163371.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 160329:160330, committed as revision 163052.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 160239:160329, committed as revision 162909.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 159907:160239, as revision 160536.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged trunk revision 159907 into the lw-ipo branch, as revision 160493.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 159321:159906, as revision 160455.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk revision 159321, and checked in as
revision 160432.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 159200:159320, as revision 160367.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 158827:159200, as revision 160358.

Did regtest and ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 158826:158827, as revision 160212.

Ran spec2k-int with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 157987:158826, as revision 160142.

Tested: bootstrap, regtest on x86_64-unknown-linux-gnu, and spec2k-int
with lipo.

thanks,
raksit

[lipo] merge from trunk

[Raksit Ashok]

Merged lw-ipo branch from trunk 155411:157987, as revision 159023.

Tested: bootstrap, regtest on x86_64-unknown-linux-gnu, and spec2k-int
with lipo.

thanks,
raksit

[lipo] merge from trunk

[Xinliang David Li]

lw-ipo branch is merged from trunk 151806:153643

Tested: SPEC2k, SPEC2006 with LIPO.

David

[lipo]: merge from trunk

[Xinliang David Li]

This is a merge from trunk 151395:151806

Along with the merge, several fixes to resolve the conflicts:

1) Disallow auxiliary functions in ipa early sra. The aux functions
   may get deleted.
2) Change the assembler name for sra transformed function to avoid
   name conflict in assembly file -- the conflict may come from a
   transformed function and another function in aux module which is
   emitted (e.g, in comdat)
3) Due to the phase ordering change of thunk emission, thunks for external
   auxilary functions are conditionally emitted -- leading to inconsistent
   comdat group (with the defining primary module) -- this can result in
   unsats.
4) during cfg fixup for sra transformation, the eh landing pad can be missing.
   This is due to the wrong order of eh edge manipulation.

Testing: SPEC2k int with LIPO -- all clean
             SPEC06 (C/C++) with LIPO -- all clean except deallI with
an outstanding problem: missing ipa summary for a new generated
function.


David

[lipo] merge from trunk

[Xinliang David Li]

Merged revisions
149842-149846,149853-149854,149856-149857,149861-149862,149866-149867,
149869,149872-149874,149917-149919,149921,149923-149926,149929-149933,
149936-149940,149942-149943,149945,149951-149952,149958,149962,149964,
149969-149970,149973-149975,149978-149985,149987-149991,149993-149994,
149997,149999-150010,150013,150016-150019,150021-150022,150024-150025,
150030-150031,150035,150038,150040-150042,150045,150047-150049,150051,
150053-150054,150059-150060,150062-150063,150065,150067-150069,150072-150073,
150075,150078-150080,150083,150086-150087,150089-150092,150095-150098,150100,
150103,150106-150122,150129-150136,150139-150142,150145-150154,150156-150157,
150161-150163,150165-150166,150168,150170,150173,150181,150189,150192-150196,
150198-150201,150205,150207,150215-150216,150219-150223,150225,150227-150228,
150230,150233-150235,150248,150250-150253,150260,150263,150265,150267,150269,
150271-150272,150277-150278,150280-150283,150286-150307,150309,150312-150316,
150319,150323-150328,150333-150334,150336,150339-150345,150349,150352-150353,
150355-150358,150361,150364,150367-150372,150375-150376,150379,150383,150387,
150393-150394,150452,150454-150455,150458,150461,150463,150465,150467,
150469-150471,150474-150475,150478,150483,150486,150488,150493,150495-150496
via svnmerge from
svn+ssh://davidxl@gcc.gnu.org/svn/gcc/trunk

Tested: SPEC2k, SPEC06 in LIPO mode.

David

[lipo] merge from trunk

[Xinliang David Li]

Merged revisions 149500-149501,149503,149506-149509,149511,149513-149516,
149518-149520,149523-149526,149530,149532-149537,149540,149544-149553,
149556-149586,149590-149591,149593-149594,149603,149611-149612,149614,
149624,149626-149629,149631-149632,149635-149639,149641,149644,149647-149650,
149653,149655,149661-149680,149685-149686,149688-149691,149694,149696,
149700-149702,149704-149705,149712,149714-149716,149719,149721-149722,
149725,149730-149731,149733-149734,149736-149737,149740,149744,149746,
149748,149750,149755-149757,149762-149763,149765-149766,149770,149772,
149774,149778-149782,149785,149789,149792-149794,149797,149800,149803,
149805-149813,149816-149817,149819-149822,149825-149827,149829-149836

Tested: SPEC2k, SPEC06 with LIPO.

David

[lipo] merge from trunk

[Xinliang David Li]

[-- Attachment #1: Type: text/plain, Size: 1333 bytes --]

Merged revisions
148917,148919,148925-148938,148941-148942,148946-148953,148955,
148958-148959,148961-148968,148971,148975-148984,148986-148987,
148996,148999,149002,149004-149014,149017-149018,149022-149023,
149031-149038,149043,149046-149048,149054,149057,149059-149060,
149062-149070,149073-149076,149078-149080,149082-149090,149093-149094,
149098,149100-149103,149108-149109,149112-149115,149117,149119-149121,
149126,149128,149135-149138,149140-149141,149144-149155,149157-149158,
149162-149167,149169-149171,149176,149178-149179,149182,149188,149190,
149195,149199,149204-149207,149209-149212,149216-149217,149222-149228,
149234-149236,149238-149239,149241-149243,149246-149247,149260,149262,
149268,149276-149277,149279,149282-149283,149285-149286,149289-149292,
149297,149300,149307,149310-149314,149316-149320,149325-149328,
149330-149331,149333-149334,149341,149345-149346,149350-149351,
149354,149357,149361-149364,149367-149368,149373,149377-149378,
149383,149390,149393,149396,149398-149402,149405-149406,149408,
149411,149413-149414,149416-149419,149421-149424,149426-149427,
149433,149438-149439,149452-149470,149473-149475,149479


Also included changes that get rid of an generic interface (introduced
in lw-ipo branch) cgraph_real_node and make it into a LIPO specific
interface. See attached file.

Thanks,

David

[-- Attachment #2: cgraph_real_node.p --]
[-- Type: text/x-pascal, Size: 6804 bytes --]

Index: gcc/cgraphbuild.c
===================================================================
--- gcc/cgraphbuild.c	(revision 148871)
+++ gcc/cgraphbuild.c	(working copy)
@@ -168,7 +168,9 @@ add_fake_indirect_call_edges (struct cgr
         {
           struct cgraph_edge *e;
           tree decl = direct_call1->decl;
-          e = cgraph_create_edge (node, cgraph_real_node (decl), NULL,
+          e = cgraph_create_edge (node,
+	                          cgraph_lipo_get_resolved_node (decl),
+				  NULL,
                                   count1, 0, 0);
           e->indirect_call = 1;
         }
@@ -180,7 +182,9 @@ add_fake_indirect_call_edges (struct cgr
         {
           struct cgraph_edge *e;
           tree decl = direct_call2->decl;
-          e = cgraph_create_edge (node, cgraph_real_node (decl), NULL,
+          e = cgraph_create_edge (node,
+	                          cgraph_lipo_get_resolved_node (decl),
+				  NULL,
                                   count2, 0, 0);
           e->indirect_call = 1;
         }
@@ -230,7 +234,11 @@ build_cgraph_edges (void)
 	  {
 	    size_t i;
 	    size_t n = gimple_call_num_args (stmt);
-	    cgraph_create_edge (node, cgraph_real_node (decl), stmt,
+	    struct cgraph_node *callee_node = cgraph_node (decl);
+
+	    if (L_IPO_COMP_MODE)
+	      callee_node = cgraph_lipo_get_resolved_node (decl);
+	    cgraph_create_edge (node, callee_node, stmt,
 				bb->count, compute_call_stmt_bb_frequency (current_function_decl, bb),
 				bb->loop_depth);
 	    for (i = 0; i < n; i++)
@@ -333,11 +341,16 @@ rebuild_cgraph_edges (void)
 	tree decl;
 
 	if (is_gimple_call (stmt) && (decl = gimple_call_fndecl (stmt)))
-	  cgraph_create_edge (node, cgraph_real_node (decl), stmt,
-			      bb->count,
-			      compute_call_stmt_bb_frequency
+	  {
+            struct cgraph_node *callee_node = cgraph_node (decl);
+            if (L_IPO_COMP_MODE)
+              callee_node = cgraph_lipo_get_resolved_node (decl);
+	    cgraph_create_edge (node, callee_node, stmt,
+                                bb->count,
+                                compute_call_stmt_bb_frequency
 			        (current_function_decl, bb),
-			      bb->loop_depth);
+                                bb->loop_depth);
+          }
 
       }
 
Index: gcc/cgraph.h
===================================================================
--- gcc/cgraph.h	(revision 149302)
+++ gcc/cgraph.h	(working copy)
@@ -478,8 +478,8 @@ void cgraph_do_link (void);
 struct cgraph_sym *cgraph_link_node (struct cgraph_node *);
 tree cgraph_find_decl (tree asm_name);
 void cgraph_remove_link_node (struct cgraph_node *node);
-struct cgraph_node *cgraph_real_node (tree decl);
-struct cgraph_node *cgraph_real_node_1 (tree decl, bool);
+struct cgraph_node *cgraph_lipo_get_resolved_node (tree decl);
+struct cgraph_node *cgraph_lipo_get_resolved_node_1 (tree decl, bool);
 unsigned  cgraph_get_module_id (tree fndecl);
 bool cgraph_is_auxiliary (tree fndecl);
 void cgraph_process_module_scope_statics (void);
Index: gcc/cgraphunit.c
===================================================================
--- gcc/cgraphunit.c	(revision 149302)
+++ gcc/cgraphunit.c	(working copy)
@@ -733,7 +733,9 @@ verify_cgraph_node (struct cgraph_node *
 			    error_found = true;
 			  }
 			if (!clone_of_p (cgraph_node (decl), e->callee)
-                            && !clone_of_p (cgraph_real_node (decl), e->callee)
+                            && (!L_IPO_COMP_MODE
+                                || !clone_of_p (cgraph_lipo_get_resolved_node (decl),
+                                                e->callee))
 			    && !e->callee->global.inlined_to)
 			  {
 			    error ("edge points to wrong declaration:");
@@ -1972,8 +1974,8 @@ cgraph_materialize_all_clones (void)
 
 	    if (decl && decl != e->callee->decl
                 && (!L_IPO_COMP_MODE || !decl
-                    || (cgraph_real_node (decl)
-                        != cgraph_real_node (e->callee->decl))))
+                    || (cgraph_lipo_get_resolved_node (decl)
+                        != cgraph_lipo_get_resolved_node (e->callee->decl))))
 	      {
 		gimple new_stmt;
 		gimple_stmt_iterator gsi;
Index: gcc/cp/cp-objcp-common.c
===================================================================
--- gcc/cp/cp-objcp-common.c	(revision 148871)
+++ gcc/cp/cp-objcp-common.c	(working copy)
@@ -375,7 +375,8 @@ cmp_templ_arg (tree ta1, tree ta2)
           if (TREE_CODE (td1) != TREE_CODE (td2))
             return 0;
           if (TREE_CODE (td1) == FUNCTION_DECL)
-            return cgraph_real_node (td1) == cgraph_real_node (td2);
+            return (cgraph_lipo_get_resolved_node (td1)
+                    == cgraph_lipo_get_resolved_node (td2));
           else
             {
               gcc_assert (TREE_CODE (td1) == VAR_DECL);
Index: gcc/coverage.c
===================================================================
--- gcc/coverage.c	(revision 148960)
+++ gcc/coverage.c	(working copy)
@@ -471,7 +471,7 @@ get_coverage_counts_entry (struct functi
     return NULL;
 
   decl = func->decl;
-  real_node = cgraph_real_node_1 (decl, false);
+  real_node = cgraph_lipo_get_resolved_node_1 (decl, false);
   if (real_node && 0)
     {
       counts_entry_t real_elt;
Index: gcc/l-ipo.c
===================================================================
--- gcc/l-ipo.c	(revision 149302)
+++ gcc/l-ipo.c	(working copy)
@@ -1254,7 +1254,7 @@ cgraph_is_inline_body_available_in_modul
    is a flag indicating that a non null link target must be returned.  */
 
 struct cgraph_node *
-cgraph_real_node_1 (tree decl, bool do_assert)
+cgraph_lipo_get_resolved_node_1 (tree decl, bool do_assert)
 {
   struct cgraph_sym **slot;
 
@@ -1304,14 +1304,11 @@ cgraph_real_node_1 (tree decl, bool do_a
    is resolved to after linking/symbol resolution.  */
 
 struct cgraph_node *
-cgraph_real_node (tree decl)
+cgraph_lipo_get_resolved_node (tree decl)
 {
   struct cgraph_node *node = NULL;
 
-  /* No linking is needed.  */
-  if (!L_IPO_COMP_MODE || !global_link_performed)
-    return cgraph_node (decl);
-
+  gcc_assert (L_IPO_COMP_MODE && global_link_performed);
   gcc_assert (cgraph_symtab);
 
   /* Never merged.  */
@@ -1326,7 +1323,7 @@ cgraph_real_node (tree decl)
   if (TREE_STATIC (decl))
     return cgraph_node (decl);
 
-  node = cgraph_real_node_1 (decl, true);
+  node = cgraph_lipo_get_resolved_node_1 (decl, true);
   return node;
 }
 
@@ -1349,7 +1346,7 @@ cgraph_remove_link_node (struct cgraph_n
 
   /* Skip if node is an inline clone or if the node has
      defintion that is not really resolved to the merged node.  */
-  if (cgraph_real_node_1 (decl, false) != node)
+  if (cgraph_lipo_get_resolved_node_1 (decl, false) != node)
     return;
 
   name = DECL_ASSEMBLER_NAME (decl);

[lipo] merge from trunk

[Xinliang David Li]

Merged revisions
147998,148000,148003,148009-148011,148013-148015,148017-148021,148025-148027,
148030,148032,148035-148037,148039,148045-148049,148051-148055,148061,148064-148067,148069,
148071-148072,148074-148081,148083,148086,148088-148091,148093-148099,148103,148105,148109-148111,
148113,148115-148116,148118-148122,148124-148127,148130-148131,148134-148135,148137-148138,148140,
148142,148144-148147,148149,148156,148159-148163,148167,148170-148174,148177-148178,148189-148191,
148196-148199,148203-148207,148210-148213,148215,148220-148224,148233,148237-148238,148241-148244,
148247,148249-148263,148269-148271,148273,148275-148280,148282,148285-148287,148289-148290,148292-148293,
148296,148298-148299,148302,148306,148309,148311,148313-148319,148321-148322,148324-148325,148328,
148332-148333,148336-148337,148339-148349,148352,148355-148358,148361,148364-148367,148390,148392-148396,
148402-148404,148407-148415,148428,148431,148433-148434,148437-148438,148440-148444,148448-148449,148451-148453,
148456,148458-148463,148466,148471-148472,148480,148483,148485-148487,148491-148494,148497-148499,148503,
148506,148510-148512,148515-148523,148525-148526,148530,148532-148535,148538-148552,148554-148555,148562,
148565-148566,148568,148589,148593,148597,148606,148608-148609,148611-148612,148614,148621-148622,148624,
148626-148628,148630-148631,148633,148635,148640-148644,148649,148651-148657,148659,148662-148667,148673,
148685,148688-148698,148701-148703,148705,148707-148713,148718-148721,148723,148727-148729,148731,148737-148738,
148742-148747,148749-148751,148755-148756,148758-148770,148774-148777,148779-148796,148798-148801,148804,148806,
148808-148811,148813-148817,148821,148823,148825-148828,148831,148833-148852,148857,148861-148862,148868-148870,
148872,148877,148880,148883,148885,148888-148890,148892-148893,148895-148906,148909-148910,148913-148916
via svnmerge from
svn+ssh://davidxl@gcc.gnu.org/svn/gcc/trunk

Tested LIPO functionality with SPEC2006.

David

[lipo]: merge from trunk

[Xinliang David Li]

Hi, lw-ipo branch is merged from trunk. The merged revisions:

 147678-147680,147682-147683,147688,147695,147699,147702,147705,
 147707-147709,147712-147714,147716-147719,147722,147725-147729,
 147731-147734,147736,147739-147740,147747,147749,147751,147755-147756,
 147758-147759,147761,147763,147767,147769-147773,147775-147776,147778-147779,
 147782-147783,147786,147788-147790,147792-147794,147799-147800,147802,147804-147805,
 147807,147811-147814,147817-147821,147824,147827-147836,147840,147842,147844-147845,
 147847-147848,147850-147852,147854,147859-147860,147862-147864,147866-147868,147870,
 147873-147874,147876-147879,147883,147886,147888,147894,147898-147900,147907-147908,
 147910-147911,147913,147915-147916,147918-147920,147923,147925-147931,147933-147934,
 147937-147939,147941,147943-147945,147947,147949-147953,147956,147958,147960-147962,
 147965,147968-147970,147972-147973,147975-147978,147980-147985,147987-147989,147994-147996

Changes according to review comments from iant and dnovillo are also
incorporated into the branch.

Thanks,

David