From patchwork Wed Sep 15 21:40:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kozlyuk X-Patchwork-Id: 98958 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 10DD6A0C41; Wed, 15 Sep 2021 23:41:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B800341101; Wed, 15 Sep 2021 23:41:06 +0200 (CEST) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mails.dpdk.org (Postfix) with ESMTP id 738F1410E7 for ; Wed, 15 Sep 2021 23:41:04 +0200 (CEST) Received: by mail-lf1-f42.google.com with SMTP id m3so8158216lfu.2 for ; Wed, 15 Sep 2021 14:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vvh3Z8/6vet8mwgRC32NjQPRRQQE2PcFMPTh18sHPkA=; b=YmmFLqVSFAJ7YfaLH1VG9AnDYNMpHoIs5saOf+VeJzZNtQelF1Izbr/DNxbcEEbQbI Uk9UuiczWQmx+cZ/ioV3diSsFHQTM6ZisKDyLpd5zZXP4JhtMYKDfVvmr5LY480utXIz 2XQai8w2Hjo2bav16hCjWU/LQ2kl6Cqhf6TfNdUJPezAeYz0kIyHrSDI3IPn7HBidygU QwJjN9ZvlVB15mInCBV4cCj7jkyy6gkhz32DrUht/XFu1j/rVzfcHg2dLAMTX2l8MCVL 7n7StxucRrjLc1pLWZFZsQuITbnvGO5ojmkHmWIVOq5rfoxVAnPP9eXtydPx0lXAISoe AF0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vvh3Z8/6vet8mwgRC32NjQPRRQQE2PcFMPTh18sHPkA=; b=P79YE/rMkYv3cyrL9W4ilcgJh2EuYmHDrcnrkYg/c6BDnk//n/+s6tEhbVFabhapGx 7nsfBGNIbezyA4H97YwNI7DtIEixhi+NzeSCbnTOcWKIz7Fvw0aRM+bToPRxXWujLuOt K8Bgq63YAmiIKeTrDttHL2k1OLXaf2RCLc9MBXFJ+Ig1jv9dleN2RnT6ejK/UGs4BmMe J1ocg5MZc7JXsm7yVApuHwvKOEEDWbrnP97Zr3DB8lqaa0i1HZjTsnBRmrkyrfcQVnct wbIozdHYDCs1GGVLD/Z+mMLts5bLe0wNx3+rqLHisMrHk+t0T4qX3NjBADyfYNg/9ZV5 UfcA== X-Gm-Message-State: AOAM532T+UDhuSrWMOlDZQ5PIevD/wNgqiob06Aa8J4/gqk2tPOZcMLf cpix/2XfJysRKs4t9SPdV4LxV+aHdzZEcw== X-Google-Smtp-Source: ABdhPJwiDTjqUQqPTbmCC0WEuES23diaWqoFm55ll9Rd15nxG9eQ/ghjeERnSBMlIsMRJp08qf08rw== X-Received: by 2002:ac2:4f8f:: with SMTP id z15mr1531529lfs.361.1631742063773; Wed, 15 Sep 2021 14:41:03 -0700 (PDT) Received: from sovereign.. (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id o4sm85989lfi.16.2021.09.15.14.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 14:41:03 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk , Cristian Dumitrescu Date: Thu, 16 Sep 2021 00:40:50 +0300 Message-Id: <20210915214052.143098-4-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> References: <20210915214052.143098-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/5] table: rename local variable for Windows compatibility X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Windows SDK headers define `min` macro which breaks the definition of `min` variable in `f_lru_pos()` inline function. Rename the variable to allow inclusion of both DPDK and Windows headers in the same file. Signed-off-by: Dmitry Kozlyuk --- lib/table/rte_lru_x86.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/table/rte_lru_x86.h b/lib/table/rte_lru_x86.h index 38476d956e..b4f54113df 100644 --- a/lib/table/rte_lru_x86.h +++ b/lib/table/rte_lru_x86.h @@ -79,8 +79,8 @@ static inline int f_lru_pos(uint64_t lru_list) { __m128i lst = _mm_set_epi64x((uint64_t)-1, lru_list); - __m128i min = _mm_minpos_epu16(lst); - return _mm_extract_epi16(min, 1); + __m128i minimum = _mm_minpos_epu16(lst); + return _mm_extract_epi16(minimum, 1); } #define lru_pos(bucket) f_lru_pos(bucket->lru_list)