From patchwork Wed Nov 9 06:42:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Rosen X-Patchwork-Id: 124483 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 320DEB6F92 for ; Wed, 9 Nov 2011 17:42:52 +1100 (EST) Received: (qmail 7148 invoked by alias); 9 Nov 2011 06:42:49 -0000 Received: (qmail 7135 invoked by uid 22791); 9 Nov 2011 06:42:47 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, TW_TM X-Spam-Check-By: sourceware.org Received: from mail-pz0-f47.google.com (HELO mail-pz0-f47.google.com) (209.85.210.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 09 Nov 2011 06:42:33 +0000 Received: by pzk6 with SMTP id 6so900800pzk.6 for ; Tue, 08 Nov 2011 22:42:32 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.6.234 with SMTP id e10mr2926224pba.90.1320820952915; Tue, 08 Nov 2011 22:42:32 -0800 (PST) Received: by 10.142.187.15 with HTTP; Tue, 8 Nov 2011 22:42:32 -0800 (PST) Date: Wed, 9 Nov 2011 08:42:32 +0200 Message-ID: Subject: [patch] Fix PR tree-optimization/51015 From: Ira Rosen To: gcc-patches@gcc.gnu.org Cc: Patch Tracking 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 Hi, Some of the recently added vectorizer pattern detection functions create pattern def stmts, and set vectype for these statements. This causes an assert failure in vect_determine_vectorization_factor, since we only expect data-refs and pattern statements themselves to have the vectype set. This patch updates the assert. Bootstrapped on powerpc64-suse-linux and tested on powerpc64-suse-linux and x86_64-suse-linux. Committed. Ira ChangeLog: PR tree-optimization/51015 * tree-vect-loop.c (vect_determine_vectorization_factor): Expect vectype to be set for pattern def stmts. testsuite/ChangeLog: PR tree-optimization/51015 * gcc.dg/vect/pr51015.c: New test. +/* { dg-final { cleanup-tree-dump "vect" } } */ Index: tree-vect-loop.c =================================================================== --- tree-vect-loop.c (revision 181159) +++ tree-vect-loop.c (working copy) @@ -342,10 +342,12 @@ vect_determine_vectorization_factor (loop_vec_info if (STMT_VINFO_VECTYPE (stmt_info)) { /* The only case when a vectype had been already set is for stmts - that contain a dataref, or for "pattern-stmts" (stmts generated - by the vectorizer to represent/replace a certain idiom). */ + that contain a dataref, or for "pattern-stmts" (stmts + generated by the vectorizer to represent/replace a certain + idiom). */ gcc_assert (STMT_VINFO_DATA_REF (stmt_info) - || is_pattern_stmt_p (stmt_info)); + || is_pattern_stmt_p (stmt_info) + || pattern_def); vectype = STMT_VINFO_VECTYPE (stmt_info); } else Index: testsuite/gcc.dg/vect/pr51015.c =================================================================== --- testsuite/gcc.dg/vect/pr51015.c (revision 0) +++ testsuite/gcc.dg/vect/pr51015.c (revision 0) @@ -0,0 +1,19 @@ +/* { dg-do compile } */ + +typedef unsigned long long __u64; +static __u64 ext2_max_sizes[16 - 10 + 1]; + +void e2fsck_pass1() +{ + int i; + __u64 max_sizes; + + for (i = 10; i <= 16; i++) { + max_sizes = 12 + (1ULL << ((i) - 2)); + max_sizes = max_sizes + (1ULL << ((i) - 2)) * (1ULL << ((i) - 2)); + max_sizes = max_sizes + (1ULL << ((i) - 2)) * (1ULL << ((i) - 2)) * (1ULL <<((i) - 2)); + ext2_max_sizes[i - 10] = max_sizes; + } +} +