From patchwork Mon Jan 14 16:03:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 211821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 127792C0186 for ; Tue, 15 Jan 2013 03:04:05 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1358784246; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To:User-Agent: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=khiVt2ewHPi8o5UmMPnb tZzils0=; b=teUbdELiqr9SUIyuJXzHJ0JzGn50r2SZXskgr1POpP6xZIlNE8ur NdP0qesEPZRCT1BUTjgWapPMBILWS/iOl+MFci7RjQwjyQAoF+GYIyK3z67EJOvF /tiZ9Mozr100loaOMSQecGHIpy1tuPeKa89KtvZie1MYv24MB7Xv9a0= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=KQ0LleO2S6rabMtflFsbUKqXVs3wHMF2A7GhNHdl2HVsEPwVZ9vQHKutg64Yz+ v1wpuJJ2gXFHqGTstaI8i3N5IV/afeFQUAxPoIkp8neeIXJM4Rl+f43hdRsV5hS5 O4PJBnQONzybFlD0HCnafWhrd3pC++vQX9CfurlHh5nko=; Received: (qmail 6861 invoked by alias); 14 Jan 2013 16:03:54 -0000 Received: (qmail 6845 invoked by uid 22791); 14 Jan 2013 16:03:53 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from bromo.med.uc.edu (HELO bromo.med.uc.edu) (129.137.3.146) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jan 2013 16:03:43 +0000 Received: from bromo.med.uc.edu (localhost.localdomain [127.0.0.1]) by bromo.med.uc.edu (Postfix) with ESMTP id 59569400007; Mon, 14 Jan 2013 11:03:42 -0500 (EST) Received: (from howarth@localhost) by bromo.med.uc.edu (8.14.3/8.14.3/Submit) id r0EG3fAA015377; Mon, 14 Jan 2013 11:03:41 -0500 Date: Mon, 14 Jan 2013 11:03:41 -0500 From: Jack Howarth To: Tobias Grosser Cc: Richard Biener , gcc-patches@gcc.gnu.org, Jakub Jelinek Subject: Re: [PATCH] Allow new ISL/CLooG versions Message-ID: <20130114160341.GA15254@bromo.med.uc.edu> References: <50F427C4.60202@grosser.es> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50F427C4.60202@grosser.es> User-Agent: Mutt/1.5.18 (2008-05-17) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On Mon, Jan 14, 2013 at 04:44:04PM +0100, Tobias Grosser wrote: > On 01/14/2013 03:29 PM, Richard Biener wrote: >> >> This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo. >> >> It's probably not the best stage to move the version checks to >> gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids >> it with the caveat that in-tree CLooG 0.18.0 will fail the >> version check (they no longer ship built version.h but only >> version.h.in). >> >> I verified all GRAPHITE tests pass with 0.18.0/0.11.1. >> >> Ok for trunk? >> >> Or do people prefer to move CLooG/ISL checks to gcc/ configure >> time to fix the in-tree use of 0.18.0 and also do version checks >> of in-tree ISL at all (they don't have a version.h). > > Hi Richi, > > I think this is a good thing. But this probably requires some config > guys to approve it. > > All the best, > Tobi Tnis change has already been committed at... r195150 | rguenth | 2013-01-14 10:01:13 -0500 (Mon, 14 Jan 2013) | 5 lines 2013-01-14 Richard Biener * configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0. * configure: Re-generate This change is broken in several ways. The current commit doesn't handle isl 0.11.1 because it omits teaching config/isl.m4 how to handle revsions with... like config/cloog.m4 does. Also the current commit leaves the legacy... ISL_CHECK_VERSION(0,10) + if test "${gcc_cv_isl}" = no ; then + ISL_CHECK_VERSION(0,11) + fi test on isl 0.10 present insuring that it will fail for any out of tree isl version. Jack Index: config/isl.m4 =================================================================== --- config/isl.m4 (revision 194744) +++ config/isl.m4 (working copy) @@ -89,13 +89,13 @@ AC_DEFUN([ISL_REQUESTED], ] ) -# _ISL_CHECK_CT_PROG(MAJOR, MINOR) +# _ISL_CHECK_CT_PROG(MAJOR, MINOR, REVISION) # -------------------------------------------- # Helper for verifying ISL compile time version. m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM( [#include #include ], - [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0) + [if (strncmp (isl_version (), "isl-$1.$2.$3", strlen ("isl-$1.$2.$3")) != 0) return 1; ])]) @@ -115,9 +115,9 @@ AC_DEFUN([ISL_CHECK_VERSION], LIBS="${_isl_saved_LIBS} -lisl" echo $CFLAGS - AC_CACHE_CHECK([for version $1.$2 of ISL], + AC_CACHE_CHECK([for version $1.$2.$3 of ISL], [gcc_cv_isl], - [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], + [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2,$3)], [gcc_cv_isl=yes], [gcc_cv_isl=no], [gcc_cv_isl=yes])])