From patchwork Thu Oct 12 17:34:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 824990 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="jK+toI1u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCdJw0Fqyz9t3B for ; Fri, 13 Oct 2017 04:34:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752819AbdJLRey (ORCPT ); Thu, 12 Oct 2017 13:34:54 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:49194 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752704AbdJLRev (ORCPT ); Thu, 12 Oct 2017 13:34:51 -0400 Received: by mail-pf0-f169.google.com with SMTP id l188so5841901pfc.6 for ; Thu, 12 Oct 2017 10:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cdfzyI0hb/hE6JuaDBYGF7zMTT7SDp1yYkY2TM69WMI=; b=jK+toI1utY6QF3uNNcEK731yS2+sZiXBOYboldJS9xnt8PqhRLMWkjnBfXIg1f4PW2 FQg66xZ/yOn1vFNIy1FtEAlLb/oi639acQxNfY1UKfgxOlSiF1oGzZKlBaKjLUuxihsr NjgNMsIkVsYRLBga9QR8+FhUzMb7GOvxcnnwehl0JEIcoHhkwP4VEzEm6Cnk3ANLObad lyWARq1BD6+9G6m7Jf33mr7BEMQPCffJzexDwkaBV+/8FjrESHqWZxqmC9WubH6MvIPd rC9PhoC/uWCs4nDD6K+zGwVhowPAO9ezCMVJARO7rGU8T8phuIQltRTegMzvx4s1co3K IoNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cdfzyI0hb/hE6JuaDBYGF7zMTT7SDp1yYkY2TM69WMI=; b=oARiV/Ggu7ij75mgLv1Rsu2aKsl3NVE6fCbtYhyVgZsXd3bHnDv/6D75sSYAHTMjAs EmwmOkqm596EqeImzh1H18Ib8p0sOQEusogXczgOQhYsW2hrsk7DM/reTifdj2aSaThF G9OIK/1/NlthiM3P2Qjj6gk8GNgeL8mjAQf06+NaeD2JawVgeqmqOY9QZqGhF2nkP4qj 1Okj89YhUmu/utGkQkKdILSnzZuyFb5S2lXWsLByQKGnk5Up9oNU+VT4S5yYNL8m2gVV CsTZddxhpl1YruvFjq9casiMNzPeZefze8CBGOkm+IEDnTuhyXzd+7aKw6ZbKNAHZmSm 3xnA== X-Gm-Message-State: AMCzsaU7W/sQtjIBeDl0w+KDzMDZ1RanafPseNGrDBX8RPwS7M6VUsFW SOyfO+55RKqfAXfFjE/Jx51lQX/I X-Google-Smtp-Source: AOwi7QAP/drGbO0WU1QxU05vxq0+PTMZGgNNgsnBrPw2N2JxaKIGxp5yC8gGsy47DTiCnkbGvzH/cQ== X-Received: by 10.99.169.25 with SMTP id u25mr802125pge.363.1507829690822; Thu, 12 Oct 2017 10:34:50 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id q8sm25037929pfk.100.2017.10.12.10.34.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 10:34:50 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 03/12] nfp: bpf: add missing return in jne_imm optimization Date: Thu, 12 Oct 2017 10:34:09 -0700 Message-Id: <20171012173418.4029-4-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171012173418.4029-1-jakub.kicinski@netronome.com> References: <20171012173418.4029-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We optimize comparisons to immediate 0 as if (reg.lo | reg.hi). The early return statement was missing, however, which means we would generate two comparisons - optimized one followed by a normal 2x 32 bit compare. Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman --- drivers/net/ethernet/netronome/nfp/bpf/jit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index cf8a6eb3ec99..5ac834e91aed 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -1191,6 +1191,7 @@ static int jne_imm(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) emit_alu(nfp_prog, reg_none(), reg_a(insn->dst_reg * 2), ALU_OP_OR, reg_b(insn->dst_reg * 2 + 1)); emit_br(nfp_prog, BR_BNE, insn->off, 0); + return 0; } tmp_reg = ur_load_imm_any(nfp_prog, imm & ~0U, imm_b(nfp_prog));