Changeset 821

Timestamp:

12/27/10 07:46:27 (14 years ago)

Author:

walter

Message:

bugzilla 3681 ICE(go.c): when function takes too long to optimize, only with -O.

Files:

• branches/dmd-1.x/src/backend/cdef.h (modified) (1 diff)
• branches/dmd-1.x/src/backend/el.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/el.h (modified) (1 diff)
• branches/dmd-1.x/src/backend/go.c (modified) (1 diff)
• trunk/src/backend/cdef.h (modified) (1 diff)
• trunk/src/backend/el.c (modified) (1 diff)
• trunk/src/backend/el.h (modified) (1 diff)
• trunk/src/backend/go.c (modified) (1 diff)

branches/dmd-1.x/src/backend/cdef.h

@@ -120 +120 @@
- */
-
-/* Solaris Version
- * -------------
- * There are two main issues: hosting the compiler on Solaris,
- * and generating (targetting) Solaris executables.
- * The "__sun", "__SVR4" and "__GNUC__" macros control hosting issues
- * for operating system and compiler dependencies, respectively.
- * To target Solaris executables, use ELFOBJ for things specific to the
- * ELF object file format, and TARGET_SOLARIS for things specific to
- * the Solaris memory model.
- * If this is all done right, one could generate a Solaris object file
- * even when compiling on win32, and vice versa.
- * The compiler source code currently uses these macros very inconsistently
- * with these goals, and should be fixed.
- */
-
-#ifndef CDEF_H
-#define CDEF_H  1
-
-3
-3
-3
+4
+4
+4
-
-
-/***********************************
- * Target machine types:
- */
-
-#define TX86            1               // target is Intel 80X86 processor
-#define TARGET_68K      0               // target is a 68K processor
-#define TARGET_POWERPC  0               // target is a PPC processor
-#define TARGET_MAC      0               // target is a macintosh
-
-// Set to 1 using the makefile
-#ifndef TARGET_LINUX
-#define TARGET_LINUX    0               // target is a linux executable
-#endif
-
-// Set to 1 using the makefile
-#ifndef TARGET_OSX
-#define TARGET_OSX      0               // target is an OSX executable
-#endif

branches/dmd-1.x/src/backend/el.c

@@ -1870 +1870 @@
-
-            default:
-                break;
-        }
-        break;
-    }
-    return result;
-}
-
-/********************************
- * Scan down commas and return the controlling elem.
- */
-
-elem *el_scancommas(elem *e)
-{
-    while (e->Eoper == OPcomma)
-        e = e->E2;
-    return e;
-}
-
+/***************************
+ * Count number of commas in the expression.
+ */
+
+int el_countCommas(elem *e)
+{   int ncommas = 0;
+    while (1)
+    {
+        if (EBIN(e))
+        {
+            ncommas += (e->Eoper == OPcomma) + el_countCommas(e->E2);
+        }
+        else if (EUNA(e))
+        {
+        }
+        else
+            break;
+        e = e->E1;
+    }
+    return ncommas;
+}
+
-#if (TARGET_POWERPC)
-void el_convconst(elem *e)
-{
-
-    int i;
-    symbol *s;
-    long    *   p;
-    targ_size_t len;
-    struct CONST_VALUE {
-#if !DDRT
-        long    val[2];                 // Largest floating constant is 8 bytes
-#else
-        fix!!
-#endif
-        symbol  *s;                     // Symbol for that floating constant
-    } *pcv;
-
-    static list_t value_list;
-    list_t pcl;
-

branches/dmd-1.x/src/backend/el.h

@@ -154 +154 @@
-void el_term(void);
-elem_p el_calloc(void);
-void el_free(elem_p);
-elem_p el_combine(elem_p ,elem_p);
-elem_p el_param(elem_p ,elem_p);
-elem_p el_params(elem_p , ...);
-elem *el_params(void **args, int length);
-int el_nparams(elem *e);
-elem_p el_pair(tym_t, elem_p, elem_p);
-#if TX86 || DEBUG
-void el_copy(elem_p ,elem_p);
-#else
-#define el_copy(to,from) {*(to) = *(from);}
-#endif
-elem_p el_alloctmp(tym_t);
-elem_p el_selecte1(elem_p);
-elem_p el_selecte2(elem_p);
-elem_p el_copytree(elem_p);
-void   el_replace_sym(elem *e,symbol *s1,symbol *s2);
-elem_p el_scancommas(elem_p);
+int el_countCommas(elem_p);
-int el_sideeffect(elem_p);
-#if TX86
-int el_depends(elem *ea,elem *eb);
-#endif
-#if LONGLONG
-targ_llong el_tolongt(elem_p);
-targ_llong el_tolong(elem_p);
-#else
-targ_long el_tolongt(elem_p);
-targ_long el_tolong(elem_p);
-#endif
-int el_allbits(elem_p,int);
-int el_signx32(elem_p);
-targ_ldouble el_toldouble(elem_p);
-void el_toconst(elem_p);
-elem_p el_same(elem_p *);
-int el_match(elem_p ,elem_p);
-int el_match2(elem_p ,elem_p);
-int el_match3(elem_p ,elem_p);
-int el_match4(elem_p ,elem_p);

branches/dmd-1.x/src/backend/go.c

@@ -216 +216 @@
-    cmes ("optfunc()\n");
-    dbg_optprint("optfunc\n");
-#ifdef DEBUG
-    if (debugb)
-    {
-        dbg_printf("................Before optimization.........\n");
-        WRfunc();
-    }
-#endif
-    iter = 0;
-
-    if (localgot)
-    {   // Initialize with:
-        //      localgot = OPgot;
-        elem *e = el_long(TYnptr, 0);
-        e->Eoper = OPgot;
-        e = el_bin(OPeq, TYnptr, el_var(localgot), e);
-        startblock->Belem = el_combine(e, startblock->Belem);
-    }
-
+    // Each pass through the loop can reduce only one level of comma expression.
+    // The infinite loop check needs to take this into account.
+    int iterationLimit = 200;
+    for (b = startblock; b; b = b->Bnext)
+    {
+        if (!b->Belem)
+            continue;
+        int d = el_countCommas(b->Belem);
+        if (d > iterationLimit)
+            iterationLimit = d;
+    }
+
-    // Some functions can take enormous amounts of time to optimize.
-    // We try to put a lid on it.
-    starttime = clock();
-    do
-    {
-        //printf("iter = %d\n", iter);
-#if TX86
-
-
+
-#else
-     L1:
-#endif
-#if MARS
-        util_progress();
-#else
-        file_progress();
-#endif
-
-        //printf("optelem\n");
-        /* canonicalize the trees        */
-        for (b = startblock; b; b = b->Bnext)
-            if (b->Belem)
-            {
-#if DEBUG
-                if(debuge)
-                {
-                    dbg_printf("before\n");
-                    elem_print(b->Belem);
-                    //el_check(b->Belem);

trunk/src/backend/cdef.h

@@ -120 +120 @@
- */
-
-/* Solaris Version
- * -------------
- * There are two main issues: hosting the compiler on Solaris,
- * and generating (targetting) Solaris executables.
- * The "__sun", "__SVR4" and "__GNUC__" macros control hosting issues
- * for operating system and compiler dependencies, respectively.
- * To target Solaris executables, use ELFOBJ for things specific to the
- * ELF object file format, and TARGET_SOLARIS for things specific to
- * the Solaris memory model.
- * If this is all done right, one could generate a Solaris object file
- * even when compiling on win32, and vice versa.
- * The compiler source code currently uses these macros very inconsistently
- * with these goals, and should be fixed.
- */
-
-#ifndef CDEF_H
-#define CDEF_H  1
-
-3
-3
-3
+4
+4
+4
-
-
-/***********************************
- * Target machine types:
- */
-
-#define TX86            1               // target is Intel 80X86 processor
-#define TARGET_68K      0               // target is a 68K processor
-#define TARGET_POWERPC  0               // target is a PPC processor
-#define TARGET_MAC      0               // target is a macintosh
-
-// Set to 1 using the makefile
-#ifndef TARGET_LINUX
-#define TARGET_LINUX    0               // target is a linux executable
-#endif
-
-// Set to 1 using the makefile
-#ifndef TARGET_OSX
-#define TARGET_OSX      0               // target is an OSX executable
-#endif

trunk/src/backend/el.c

@@ -1870 +1870 @@
-
-            default:
-                break;
-        }
-        break;
-    }
-    return result;
-}
-
-/********************************
- * Scan down commas and return the controlling elem.
- */
-
-elem *el_scancommas(elem *e)
-{
-    while (e->Eoper == OPcomma)
-        e = e->E2;
-    return e;
-}
-
+/***************************
+ * Count number of commas in the expression.
+ */
+
+int el_countCommas(elem *e)
+{   int ncommas = 0;
+    while (1)
+    {
+        if (EBIN(e))
+        {
+            ncommas += (e->Eoper == OPcomma) + el_countCommas(e->E2);
+        }
+        else if (EUNA(e))
+        {
+        }
+        else
+            break;
+        e = e->E1;
+    }
+    return ncommas;
+}
+
-#if (TARGET_POWERPC)
-void el_convconst(elem *e)
-{
-
-    int i;
-    symbol *s;
-    long    *   p;
-    targ_size_t len;
-    struct CONST_VALUE {
-#if !DDRT
-        long    val[2];                 // Largest floating constant is 8 bytes
-#else
-        fix!!
-#endif
-        symbol  *s;                     // Symbol for that floating constant
-    } *pcv;
-
-    static list_t value_list;
-    list_t pcl;
-

trunk/src/backend/el.h

@@ -154 +154 @@
-void el_term(void);
-elem_p el_calloc(void);
-void el_free(elem_p);
-elem_p el_combine(elem_p ,elem_p);
-elem_p el_param(elem_p ,elem_p);
-elem_p el_params(elem_p , ...);
-elem *el_params(void **args, int length);
-int el_nparams(elem *e);
-elem_p el_pair(tym_t, elem_p, elem_p);
-#if TX86 || DEBUG
-void el_copy(elem_p ,elem_p);
-#else
-#define el_copy(to,from) {*(to) = *(from);}
-#endif
-elem_p el_alloctmp(tym_t);
-elem_p el_selecte1(elem_p);
-elem_p el_selecte2(elem_p);
-elem_p el_copytree(elem_p);
-void   el_replace_sym(elem *e,symbol *s1,symbol *s2);
-elem_p el_scancommas(elem_p);
+int el_countCommas(elem_p);
-int el_sideeffect(elem_p);
-#if TX86
-int el_depends(elem *ea,elem *eb);
-#endif
-#if LONGLONG
-targ_llong el_tolongt(elem_p);
-targ_llong el_tolong(elem_p);
-#else
-targ_long el_tolongt(elem_p);
-targ_long el_tolong(elem_p);
-#endif
-int el_allbits(elem_p,int);
-int el_signx32(elem_p);
-targ_ldouble el_toldouble(elem_p);
-void el_toconst(elem_p);
-elem_p el_same(elem_p *);
-int el_match(elem_p ,elem_p);
-int el_match2(elem_p ,elem_p);
-int el_match3(elem_p ,elem_p);
-int el_match4(elem_p ,elem_p);

trunk/src/backend/go.c

@@ -216 +216 @@
-    cmes ("optfunc()\n");
-    dbg_optprint("optfunc\n");
-#ifdef DEBUG
-    if (debugb)
-    {
-        dbg_printf("................Before optimization.........\n");
-        WRfunc();
-    }
-#endif
-    iter = 0;
-
-    if (localgot)
-    {   // Initialize with:
-        //      localgot = OPgot;
-        elem *e = el_long(TYnptr, 0);
-        e->Eoper = OPgot;
-        e = el_bin(OPeq, TYnptr, el_var(localgot), e);
-        startblock->Belem = el_combine(e, startblock->Belem);
-    }
-
+    // Each pass through the loop can reduce only one level of comma expression.
+    // The infinite loop check needs to take this into account.
+    int iterationLimit = 200;
+    for (b = startblock; b; b = b->Bnext)
+    {
+        if (!b->Belem)
+            continue;
+        int d = el_countCommas(b->Belem);
+        if (d > iterationLimit)
+            iterationLimit = d;
+    }
+
-    // Some functions can take enormous amounts of time to optimize.
-    // We try to put a lid on it.
-    starttime = clock();
-    do
-    {
-        //printf("iter = %d\n", iter);
-#if TX86
-
-
+
-#else
-     L1:
-#endif
-#if MARS
-        util_progress();
-#else
-        file_progress();
-#endif
-
-        //printf("optelem\n");
-        /* canonicalize the trees        */
-        for (b = startblock; b; b = b->Bnext)
-            if (b->Belem)
-            {
-#if DEBUG
-                if(debuge)
-                {
-                    dbg_printf("before\n");
-                    elem_print(b->Belem);
-                    //el_check(b->Belem);