From patchwork Fri Nov 8 14:50:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Segher Boessenkool X-Patchwork-Id: 1191943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-512834-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.crashing.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="b0OAX4AB"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 478jqY3d6Xz9s4Y for ; Sat, 9 Nov 2019 01:50:16 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=YEjdRLsm3IFd 4Eqgtv8xttpoiaAp9rYfLdV2UH0haW4bFNfoWnVwn5RMUlgwP/FrbGsUyrjzm9eZ KqB3drXLhSITF4gEfE3ZEMIuZyatR358m4MBLdHjiqe0cKhNAxS+J1gYk83aVzyd /JTd1tj/BdSun4w77p/SB7nUgDFGqfY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=QHCnsCmpFi4ysBdXDE 3HinkPkhs=; b=b0OAX4ABl/z5UCv3utUA3eDFO0eqHMWvZXnZO3odUvd+CUcJbo TVAp4RxEJrxeWHRCEQJcc458oX+sW67oUxJvx02L7HpBVPhpbqP1cmqknNoGA8Kv HJ7zxeR+f91Rwz+3MouVSyiDeAl+X5AL3cFSJIgU6oeKjti24NgRuG1gg= Received: (qmail 11137 invoked by alias); 8 Nov 2019 14:50:09 -0000 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 Received: (qmail 11125 invoked by uid 89); 8 Nov 2019 14:50:09 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: gcc1-power7.osuosl.org Received: from gcc1-power7.osuosl.org (HELO gcc1-power7.osuosl.org) (140.211.15.137) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Nov 2019 14:50:07 +0000 Received: by gcc1-power7.osuosl.org (Postfix, from userid 10019) id 3BD4A1240C3A; Fri, 8 Nov 2019 14:50:06 +0000 (UTC) From: Segher Boessenkool To: gcc-patches@gcc.gnu.org Cc: dje.gcc@gmail.com, Segher Boessenkool Subject: [PATCH] rs6000: Fix branch_comparison_operator Date: Fri, 8 Nov 2019 14:50:04 +0000 Message-Id: <5129594a6241832d4b87d8b5b6f76bbff0d358bc.1573224246.git.segher@kernel.crashing.org> X-IsSubscribed: yes Another part I forgot yesterday. With this, everything is back to normal. Committing. Segher 2019-11-08 Segher Boessenkool * config/rs6000/predicates.md (branch_comparison_operator): Allow only the comparison codes that make sense for the mode used, and only the codes that can be done with a single branch instruction. --- gcc/config/rs6000/predicates.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md index 5ef505b..5c5aad9 100644 --- a/gcc/config/rs6000/predicates.md +++ b/gcc/config/rs6000/predicates.md @@ -1135,10 +1135,14 @@ (define_special_predicate "equality_operator" ;; validate_condition_mode is an assertion. (define_predicate "branch_comparison_operator" (and (match_operand 0 "comparison_operator") - (and (match_test "GET_MODE_CLASS (GET_MODE (XEXP (op, 0))) == MODE_CC") - (match_test "validate_condition_mode (GET_CODE (op), - GET_MODE (XEXP (op, 0))), - 1")))) + (match_test "GET_MODE_CLASS (GET_MODE (XEXP (op, 0))) == MODE_CC") + (if_then_else (match_test "GET_MODE (XEXP (op, 0)) == CCFPmode + && !flag_finite_math_only") + (match_code "lt,gt,eq,unordered,unge,unle,ne,ordered") + (match_code "lt,ltu,le,leu,gt,gtu,ge,geu,eq,ne")) + (match_test "validate_condition_mode (GET_CODE (op), + GET_MODE (XEXP (op, 0))), + 1"))) ;; Return 1 if OP is an unsigned comparison operator. (define_predicate "unsigned_comparison_operator"