Patchwork Move Graphite from using PPL over to ISL

login
register
mail settings
Submitter Richard Guenther
Date July 2, 2012, 2:02 p.m.
Message ID <alpine.LNX.2.00.1207021602290.17233@jbgna.fhfr.qr>
Download mbox | patch
Permalink /patch/168598/
State New
Headers show

Comments

Richard Guenther - July 2, 2012, 2:02 p.m.
On Mon, 2 Jul 2012, Richard Guenther wrote:

> On Mon, 2 Jul 2012, Jack Howarth wrote:
> 
> > On Mon, Jul 02, 2012 at 09:37:20AM -0400, Jack Howarth wrote:
> > > On Mon, Jul 02, 2012 at 01:43:56PM +0200, Richard Guenther wrote:
> > > > On Thu, 28 Jun 2012, Diego Novillo wrote:
> > > > 
> > > > > On 12-06-27 11:06 , Richard Guenther wrote:
> > > > > 
> > > > > > 2012-06-27  Richard Guenther  <rguenther@suse.de>
> > > > > > 	Michael Matz  <matz@suse.de>
> > > > > > 	Tobias Grosser <tobias@grosser.es>
> > > > > > 	Sebastian Pop <sebpop@gmail.com>
> > > > > > 
> > > > > > 	config/
> > > > > > 	* cloog.m4: Set up to work against ISL only.
> > > > > > 	* isl.m4: New file.
> > > > > > 
> > > > > > 	* Makefile.def: Add ISL host module, remove PPL host module.
> > > > > > 	Adjust ClooG host module to use the proper ISL.
> > > > > > 	* Makefile.tpl: Pass ISL include flags instead of PPL ones.
> > > > > > 	* configure.ac: Include config/isl.m4.  Add ISL host library,
> > > > > > 	remove PPL.  Remove PPL configury, add ISL configury, adjust
> > > > > > 	ClooG configury.
> > > > > > 	* Makefile.in: Regenerated.
> > > > > > 	* configure: Likewise.
> > > > > > 
> > > > > > 	gcc/
> > > > > > 	* Makefile.in: Remove PPL flags in favor of ISL ones.
> > > > > > 	(BACKENDLIBS): Remove PPL libs.
> > > > > > 	(INCLUDES): Remove PPL includes in favor of ISL ones.
> > > > > > 	(graphite-clast-to-gimple.o): Remove graphite-dependences.h and
> > > > > > 	graphite-cloog-compat.h dependencies.
> > > > > > 	(graphite-dependences.o): Likewise.
> > > > > > 	(graphite-poly.o): Likewise.
> > > > > > 	* configure.ac: Declare ISL vars instead of PPL ones.
> > > > > > 	* configure: Regenerated.
> > > > > > 	* doc/install.texi: Replace PPL requirement documentation
> > > > > > 	with ISL one.
> > > > > > 	* graphite-blocking.c: Remove PPL code, add ISL equivalent.
> > > > > > 	* graphite-clast-to-gimple.c: Likewise.
> > > > > > 	* graphite-dependences.c: Likewise.
> > > > > > 	* graphite-interchange.c: Likewise.
> > > > > > 	* graphite-poly.h: Likewise.
> > > > > > 	* graphite-poly.c: Likewise.
> > > > > > 	* graphite-sese-to-poly.c: Likewise.
> > > > > > 	* graphite.c: Likewise.
> > > > > > 	* graphite-scop-detection.c: Re-arrange includes.
> > > > > > 	* graphite-cloog-util.c: Remove.
> > > > > > 	* graphite-cloog-util.h: Likewise.
> > > > > > 	* graphite-ppl.h: Likewise.
> > > > > > 	* graphite-ppl.c: Likewise.
> > > > > > 	* graphite-dependences.h: Likewise.
> > > > > > 
> > > > > > 	libgomp/
> > > > > > 	* testsuite/libgomp.graphite/force-parallel-4.c: Adjust.
> > > > > > 	* testsuite/libgomp.graphite/force-parallel-5.c: Likewise.
> > > > > > 	* testsuite/libgomp.graphite/force-parallel-7.c: Likewise.
> > > > > > 	* testsuite/libgomp.graphite/force-parallel-8.c: Likewise.
> > > > > 
> > > > > OK.
> > > > 
> > > > Committed.
> > > > 
> > > > Richard.
> > > 
> > > Richard,
> > >    At r189157, with isl 0.10 and cloog.org 0.17.0 installed from the infrastructure
> > > directory, I am seeing a configure failure with...
> > > 
> > >   $ ../gcc-4.8-20120702/configure --prefix=/sw --prefix=/sw/lib/gcc4.8 --mandir=/sw/share/man --infodir=/sw/lib/gcc4.8/info --enable-languages=c,c++,fortran,lto,objc,obj-c++,java --with-gmp=/sw --with-libiconv-prefix=/sw --with-isl=/sw --with-cloog=/sw --with-mpc=/sw --with-system-zlib --enable-checking=yes --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --program-suffix=-fsf-4.8
> > > 
> > > of...
> > > 
> > > configure:5697: checking for version 0.10 of ISL
> > > configure:5725: gcc -o conftest -g -O2 -I/sw/include -I/sw/include -I/sw/include    -L/sw/lib -lisl -lisl conftest.c  >&5
> > > conftest.c:15:11: error: expected ';' at end of declaration
> > > int main()
> > >           ^
> > >           ;
> > > 1 error generated.
> > > configure:5725: $? = 1
> > > configure: program exited with status 1
> > > configure: failed program was:
> > > | /* confdefs.h */
> > > | #define PACKAGE_NAME ""
> > > | #define PACKAGE_TARNAME ""
> > > | #define PACKAGE_VERSION ""
> > > | #define PACKAGE_STRING ""
> > > | #define PACKAGE_BUGREPORT ""
> > > | #define PACKAGE_URL ""
> > > | #define LT_OBJDIR ".libs/"
> > > | /* end confdefs.h.  */
> > > | #include <isl/version.h>
> > > |    #include <string.h>
> > > | int
> > > | main ()
> > > | {
> > > | int main()
> > > |    {
> > > |      if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0)
> > > |        return 1;
> > > |      return 0;
> > > |    }
> > > |   ;
> > > |   return 0;
> > > | }
> > > configure:5735: result: no
> > > configure:5769: error: Unable to find a usable ISL.  See config.log for details.
> > 
> > Richard,
> >    Regenerating the top-level configure with 'autoconf -I. -I./config' at r189157 doesn't resolve the issue.
> 
> Yeah, I see the issue ;)  Still my host compilers happily accept
> int main() { int main () {} } and do not error:
> 
> configure:5697: checking for version 0.10 of ISL
> configure:5725: gcc -o conftest -g      -lisl -lisl conftest.c  >&5
> configure:5725: $? = 0
> configure:5725: ./conftest
> configure:5725: $? = 0
> configure:5735: result: yes
> 
> I'll test a fix.

Like so.

Richard.

2012-07-02  Richard Guenther  <rguenther@suse.de>

	config/
	* isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer.
	Fix version test. 

	* configure: Regenerated.

Patch

diff --git a/config/isl.m4 b/config/isl.m4
index 0ddeddb..c541158 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -107,12 +107,9 @@  AC_DEFUN([ISL_REQUESTED],
 m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM(
   [#include <isl/version.h>
    #include <string.h>],
-  [int main()
-   {
-     if (strncmp (isl_version (), "isl-0.10", strlen ("isl-$1.$2")) != 0)
-       return 1;
-     return 0;
-   }])])
+  [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0)
+     return 1;
+   ])])
 
 # ISL_CHECK_VERSION ISL_CHECK_VERSION (MAJOR, MINOR)
 # ----------------------------------------------------------------
diff --git a/configure b/configure
index b157a72..0dd80ca 100755
--- a/configure
+++ b/configure
@@ -5712,12 +5712,9 @@  else
 int
 main ()
 {
-int main()
-   {
-     if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0)
-       return 1;
-     return 0;
-   }
+if (strncmp (isl_version (), "isl-0.10", strlen ("isl-0.10")) != 0)
+     return 1;
+
   ;
   return 0;
 }