From patchwork Tue Jul 27 22:22:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Pop X-Patchwork-Id: 60058 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 82A3EB70AB for ; Wed, 28 Jul 2010 08:24:14 +1000 (EST) Received: (qmail 9061 invoked by alias); 27 Jul 2010 22:24:03 -0000 Received: (qmail 8873 invoked by uid 22791); 27 Jul 2010 22:24:01 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-vw0-f47.google.com (HELO mail-vw0-f47.google.com) (209.85.212.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 27 Jul 2010 22:23:46 +0000 Received: by vws13 with SMTP id 13so4158888vws.20 for ; Tue, 27 Jul 2010 15:23:44 -0700 (PDT) Received: by 10.220.158.9 with SMTP id d9mr5509965vcx.245.1280269424640; Tue, 27 Jul 2010 15:23:44 -0700 (PDT) Received: from napoca ([163.181.251.115]) by mx.google.com with ESMTPS id v11sm3251331vbb.1.2010.07.27.15.23.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 27 Jul 2010 15:23:44 -0700 (PDT) Received: by napoca (sSMTP sendmail emulation); Tue, 27 Jul 2010 17:23:40 -0500 From: Sebastian Pop To: gcc-patches@gcc.gnu.org Cc: gcc-graphite@googlegroups.com, simbuerg@fim.uni-passau.de, Sebastian Pop Subject: [PATCH 7/7] Extend value range to silence warnings. Date: Tue, 27 Jul 2010 17:22:58 -0500 Message-Id: <1280269378-27054-8-git-send-email-sebpop@gmail.com> In-Reply-To: <1280269378-27054-1-git-send-email-sebpop@gmail.com> References: <1280269378-27054-1-git-send-email-sebpop@gmail.com> X-IsSubscribed: yes 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 2010-07-27 Andreas Simbuerger * graphite-cloog-util.c (oppose_constraint): Extend loop counter's value range (CLOOG_ORG). (cloog_matrix_to_ppl_constraint): Same. (new_Constraint_System_from_Cloog_matrix): Same. * graphite-cloog-compat.h (matrix_num_type): New. --- gcc/ChangeLog.graphite | 8 ++++++++ gcc/graphite-cloog-compat.h | 2 ++ gcc/graphite-cloog-util.c | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 87d67a1..768de7d 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,13 @@ 2010-07-27 Andreas Simbuerger + * graphite-cloog-util.c (oppose_constraint): + Extend loop counter's value range (CLOOG_ORG). + (cloog_matrix_to_ppl_constraint): Same. + (new_Constraint_System_from_Cloog_matrix): Same. + * graphite-cloog-compat.h (matrix_num_type): New. + +2010-07-27 Andreas Simbuerger + * graphite.c (graphite_initialize): Do not initialize CLooG and initialize the Parma Polyhedra Library manually when using CLOOG_ORG. diff --git a/gcc/graphite-cloog-compat.h b/gcc/graphite-cloog-compat.h index c39b18e..03fc124 100644 --- a/gcc/graphite-cloog-compat.h +++ b/gcc/graphite-cloog-compat.h @@ -25,8 +25,10 @@ along with GCC; see the file COPYING3. If not see /* Restore compatibility to CLooG Legacy. */ #ifdef CLOOG_ORG typedef const struct clast_expr *clast_name_p; +typedef unsigned matrix_num_type; #else typedef const char *clast_name_p; +typedef int matrix_num_type; #endif #ifdef CLOOG_ORG diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c index 1770458..5ea7c3c 100644 --- a/gcc/graphite-cloog-util.c +++ b/gcc/graphite-cloog-util.c @@ -57,7 +57,7 @@ ppl_Constrain_System_number_of_constraints (ppl_const_Constraint_System_t pcs) static void oppose_constraint (CloogMatrix *m, int row) { - int k; + matrix_num_type k; /* Do not oppose the first column: it is the eq/ineq one. */ for (k = 1; k < m->NbColumns; k++) @@ -168,7 +168,7 @@ new_Cloog_Matrix_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph) static ppl_Constraint_t cloog_matrix_to_ppl_constraint (CloogMatrix *matrix, int row) { - int j; + matrix_num_type j; ppl_Constraint_t cstr; ppl_Coefficient_t coef; ppl_Linear_Expression_t expr; @@ -203,7 +203,7 @@ static void new_Constraint_System_from_Cloog_Matrix (ppl_Constraint_System_t *pcs, CloogMatrix *matrix) { - int i; + matrix_num_type i; ppl_new_Constraint_System (pcs);