From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22B65A0579 for ; Fri, 19 Mar 2021 15:36:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13624140EA3; Fri, 19 Mar 2021 15:36:42 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 9AC874003F; Fri, 19 Mar 2021 15:36:38 +0100 (CET) IronPort-SDR: JR8AZED4lFHUhi9WqFiHzJQCr7Vj3DA9rzZZhOGXOV6C9NWTrLRbhUNrwJIxba+ybGil5mTxL2 TnBgeF2Abe3g== X-IronPort-AV: E=McAfee;i="6000,8403,9928"; a="177487517" X-IronPort-AV: E=Sophos;i="5.81,262,1610438400"; d="scan'208";a="177487517" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2021 07:36:37 -0700 IronPort-SDR: pbvV2sme5FZe2uxwC7AueeA0IXPIfzP7/dhiA3jywWrcWhNoUx3i1ZUsPFcFbVeBjFvCdSIV3z AAg+07wkHv/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,262,1610438400"; d="scan'208";a="440077970" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by fmsmga002.fm.intel.com with ESMTP; 19 Mar 2021 07:36:25 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Cc: churchill.khangar@intel.com, stable@dpdk.org Date: Fri, 19 Mar 2021 14:36:25 +0000 Message-Id: <20210319143625.78445-1-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-stable] [PATCH] pipeline: fix translation for mailbox fields X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Fix to make the translation of extern object & function mailbox fields (e.ext_obj.field and f.ext_func.field) work for the add/sub, shl/shr, jmplt/jmpgt instructions. Fixes: baf7999303d0 ("pipeline: introduce SWX add instruction") Fixes: c88c62943818 ("pipeline: introduce SWX subtract instruction") Fixes: b09ba6d0a3c2 ("pipeline: introduce SWX SHL instruction") Fixes: e0f51638b715 ("pipeline: introduce SWX SHR instruction") Fixes: b3947e25bed4 ("pipeline: introduce SWX jump and return instructions") Cc: stable@dpdk.org Signed-off-by: Cristian Dumitrescu --- lib/librte_pipeline/rte_swx_pipeline.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/librte_pipeline/rte_swx_pipeline.c b/lib/librte_pipeline/rte_swx_pipeline.c index 5257a5360..4455d9135 100644 --- a/lib/librte_pipeline/rte_swx_pipeline.c +++ b/lib/librte_pipeline/rte_swx_pipeline.c @@ -3697,9 +3697,9 @@ instr_alu_add_translate(struct rte_swx_pipeline *p, fsrc = struct_field_parse(p, action, src, &src_struct_id); if (fsrc) { instr->type = INSTR_ALU_ADD; - if (dst[0] == 'h' && src[0] == 'm') + if (dst[0] == 'h' && src[0] != 'h') instr->type = INSTR_ALU_ADD_HM; - if (dst[0] == 'm' && src[0] == 'h') + if (dst[0] != 'h' && src[0] == 'h') instr->type = INSTR_ALU_ADD_MH; if (dst[0] == 'h' && src[0] == 'h') instr->type = INSTR_ALU_ADD_HH; @@ -3750,9 +3750,9 @@ instr_alu_sub_translate(struct rte_swx_pipeline *p, fsrc = struct_field_parse(p, action, src, &src_struct_id); if (fsrc) { instr->type = INSTR_ALU_SUB; - if (dst[0] == 'h' && src[0] == 'm') + if (dst[0] == 'h' && src[0] != 'h') instr->type = INSTR_ALU_SUB_HM; - if (dst[0] == 'm' && src[0] == 'h') + if (dst[0] != 'h' && src[0] == 'h') instr->type = INSTR_ALU_SUB_MH; if (dst[0] == 'h' && src[0] == 'h') instr->type = INSTR_ALU_SUB_HH; @@ -3880,9 +3880,9 @@ instr_alu_shl_translate(struct rte_swx_pipeline *p, fsrc = struct_field_parse(p, action, src, &src_struct_id); if (fsrc) { instr->type = INSTR_ALU_SHL; - if (dst[0] == 'h' && src[0] == 'm') + if (dst[0] == 'h' && src[0] != 'h') instr->type = INSTR_ALU_SHL_HM; - if (dst[0] == 'm' && src[0] == 'h') + if (dst[0] != 'h' && src[0] == 'h') instr->type = INSTR_ALU_SHL_MH; if (dst[0] == 'h' && src[0] == 'h') instr->type = INSTR_ALU_SHL_HH; @@ -3933,9 +3933,9 @@ instr_alu_shr_translate(struct rte_swx_pipeline *p, fsrc = struct_field_parse(p, action, src, &src_struct_id); if (fsrc) { instr->type = INSTR_ALU_SHR; - if (dst[0] == 'h' && src[0] == 'm') + if (dst[0] == 'h' && src[0] != 'h') instr->type = INSTR_ALU_SHR_HM; - if (dst[0] == 'm' && src[0] == 'h') + if (dst[0] != 'h' && src[0] == 'h') instr->type = INSTR_ALU_SHR_MH; if (dst[0] == 'h' && src[0] == 'h') instr->type = INSTR_ALU_SHR_HH; @@ -6853,9 +6853,9 @@ instr_jmp_lt_translate(struct rte_swx_pipeline *p, fb = struct_field_parse(p, action, b, &b_struct_id); if (fb) { instr->type = INSTR_JMP_LT; - if (a[0] == 'h' && b[0] == 'm') + if (a[0] == 'h' && b[0] != 'h') instr->type = INSTR_JMP_LT_HM; - if (a[0] == 'm' && b[0] == 'h') + if (a[0] != 'h' && b[0] == 'h') instr->type = INSTR_JMP_LT_MH; if (a[0] == 'h' && b[0] == 'h') instr->type = INSTR_JMP_LT_HH; @@ -6910,9 +6910,9 @@ instr_jmp_gt_translate(struct rte_swx_pipeline *p, fb = struct_field_parse(p, action, b, &b_struct_id); if (fb) { instr->type = INSTR_JMP_GT; - if (a[0] == 'h' && b[0] == 'm') + if (a[0] == 'h' && b[0] != 'h') instr->type = INSTR_JMP_GT_HM; - if (a[0] == 'm' && b[0] == 'h') + if (a[0] != 'h' && b[0] == 'h') instr->type = INSTR_JMP_GT_MH; if (a[0] == 'h' && b[0] == 'h') instr->type = INSTR_JMP_GT_HH; -- 2.17.1