From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4697610A3 for ; Wed, 20 Mar 2019 14:18:11 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id h18so11679974wml.1 for ; Wed, 20 Mar 2019 06:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=iPJdE8jiIeo+EMgIBVA2pQAufwdDsf5dxbtN9yPLSq4=; b=tOxiCqz+FC1pnxyoCfUI2z9qyyIGy2IXVONWi9VhnVJBbqcTZqP+D+RSxLUCfzqbeX 8Ul7kGZT4DvRESBsntJ2WdB9G+56Mf5QYUpPyx81yHRIawgZ77d3vxGc7ktEqbwWRGBN wJY/wMK2rVeTqECldZ4t1TkCTspKYSWq14i7VBM7J5y9R3/b5TJtwKdkAZxgh6nOLkpg /bQVLsZPOWcncViwZzyogaYC4ztPiMGv/DmS3rEVBFJr1mPXWrC2ILB+IoXPWROxIP/5 I69kNf/6RxJ83I3qdmliBEP897a5kz///orE1QaHTYr7JI+0wvwhRtMNAxxPZn4wQ2Un d19Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iPJdE8jiIeo+EMgIBVA2pQAufwdDsf5dxbtN9yPLSq4=; b=LiGYtkpFIm6r18ixSKLpyjRfSGz1gt4t+XXPYHMDGX2LEUz1XcLupxqGC8CqNj1J98 k7DAc1ixPNrLWj7O1I/jWhG1QlektkO8qDS31j3MTrzAy0yMJ8Jmbdy8qx7Ku7UiMbHV emLoLRBURWBzbr/UBlMoO1PzlRw/GCtFBYD+/S6CS1wBxwVbvZSQYWbIYOW05v5vHM+8 pjgOJ1ynQ5oObPtroT7u3R0b/QIowKXco3/CRc0lNiWN2I3TL4KO5b51B9M4kUZkkxOu ODU+V9fEVJvqn9+0EcEg+tfl6CAiWL3ql0OsE4K669hjUWPGMFFjTxXgPF+dYjIAANe4 Eqng== X-Gm-Message-State: APjAAAWaUv0FBhwqhE0aTv4Vl8dmOT1R3OpBIkl99mxy4u7QVgaYTh1e iLTnu9M2PBB1oarBBHoY5mYVsGLWHw9GLA== X-Google-Smtp-Source: APXvYqwjJZPCyKG9y06v48TlfyWEAHNdardYSkkHXYZtFvfeZJpG3PW3tikgemTlWRpx4JWLaILaKQ== X-Received: by 2002:a7b:c769:: with SMTP id x9mr8545011wmk.103.1553087889710; Wed, 20 Mar 2019 06:18:09 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id l3sm1532182wmh.3.2019.03.20.06.18.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 06:18:07 -0700 (PDT) From: luca.boccassi@gmail.com To: dev@dpdk.org Date: Wed, 20 Mar 2019 13:18:01 +0000 Message-Id: <20190320131801.28289-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181224125627.25690-1-bluca@debian.org> References: <20181224125627.25690-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4] build: use generic march on arm64 when using 'default' machine X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Mar 2019 13:18:11 -0000 From: Luca Boccassi When building for generic distribution we need a stable baseline architecture, or depending on the build worker the result will vary. Force the default flags if the user explicitly sets machine=default at configuration time. Fixes: b1d48c41189a ("build: support ARM with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Pavan Nikhilesh --- v2: fix typo in commit message, remove variable used only once v3: put back temporary variable, as "machine" gets overwritten by the function and loses the original value before we need it. v4: add acked-by, remove redundant assignment config/arm/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 8e892fa77..dddec4e04 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -6,6 +6,7 @@ march_opt = '-march=@0@'.format(machine) arm_force_native_march = false +arm_force_default_march = (machine == 'default') machine_args_generic = [ ['default', ['-march=armv8-a+crc+crypto']], @@ -106,7 +107,10 @@ else cmd_generic = ['generic', '', '', 'default', ''] cmd_output = cmd_generic # Set generic by default machine_args = [] # Clear previous machine args - if not meson.is_cross_build() + if arm_force_default_march and not meson.is_cross_build() + machine = impl_generic + impl_pn = 'default' + elif not meson.is_cross_build() # The script returns ['Implementer', 'Variant', 'Architecture', # 'Primary Part number', 'Revision'] detect_vendor = find_program(join_paths( -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B9C48A00E6 for ; Wed, 20 Mar 2019 14:18:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C3C2211A4; Wed, 20 Mar 2019 14:18:12 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4697610A3 for ; Wed, 20 Mar 2019 14:18:11 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id h18so11679974wml.1 for ; Wed, 20 Mar 2019 06:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=iPJdE8jiIeo+EMgIBVA2pQAufwdDsf5dxbtN9yPLSq4=; b=tOxiCqz+FC1pnxyoCfUI2z9qyyIGy2IXVONWi9VhnVJBbqcTZqP+D+RSxLUCfzqbeX 8Ul7kGZT4DvRESBsntJ2WdB9G+56Mf5QYUpPyx81yHRIawgZ77d3vxGc7ktEqbwWRGBN wJY/wMK2rVeTqECldZ4t1TkCTspKYSWq14i7VBM7J5y9R3/b5TJtwKdkAZxgh6nOLkpg /bQVLsZPOWcncViwZzyogaYC4ztPiMGv/DmS3rEVBFJr1mPXWrC2ILB+IoXPWROxIP/5 I69kNf/6RxJ83I3qdmliBEP897a5kz///orE1QaHTYr7JI+0wvwhRtMNAxxPZn4wQ2Un d19Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iPJdE8jiIeo+EMgIBVA2pQAufwdDsf5dxbtN9yPLSq4=; b=LiGYtkpFIm6r18ixSKLpyjRfSGz1gt4t+XXPYHMDGX2LEUz1XcLupxqGC8CqNj1J98 k7DAc1ixPNrLWj7O1I/jWhG1QlektkO8qDS31j3MTrzAy0yMJ8Jmbdy8qx7Ku7UiMbHV emLoLRBURWBzbr/UBlMoO1PzlRw/GCtFBYD+/S6CS1wBxwVbvZSQYWbIYOW05v5vHM+8 pjgOJ1ynQ5oObPtroT7u3R0b/QIowKXco3/CRc0lNiWN2I3TL4KO5b51B9M4kUZkkxOu ODU+V9fEVJvqn9+0EcEg+tfl6CAiWL3ql0OsE4K669hjUWPGMFFjTxXgPF+dYjIAANe4 Eqng== X-Gm-Message-State: APjAAAWaUv0FBhwqhE0aTv4Vl8dmOT1R3OpBIkl99mxy4u7QVgaYTh1e iLTnu9M2PBB1oarBBHoY5mYVsGLWHw9GLA== X-Google-Smtp-Source: APXvYqwjJZPCyKG9y06v48TlfyWEAHNdardYSkkHXYZtFvfeZJpG3PW3tikgemTlWRpx4JWLaILaKQ== X-Received: by 2002:a7b:c769:: with SMTP id x9mr8545011wmk.103.1553087889710; Wed, 20 Mar 2019 06:18:09 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id l3sm1532182wmh.3.2019.03.20.06.18.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 06:18:07 -0700 (PDT) From: luca.boccassi@gmail.com To: dev@dpdk.org Date: Wed, 20 Mar 2019 13:18:01 +0000 Message-Id: <20190320131801.28289-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181224125627.25690-1-bluca@debian.org> References: <20181224125627.25690-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4] build: use generic march on arm64 when using 'default' machine X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190320131801.mO3krk4XcapzEMzIggVSyONzCZPJaxhv4ABxCubeVa0@z> From: Luca Boccassi When building for generic distribution we need a stable baseline architecture, or depending on the build worker the result will vary. Force the default flags if the user explicitly sets machine=default at configuration time. Fixes: b1d48c41189a ("build: support ARM with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Pavan Nikhilesh --- v2: fix typo in commit message, remove variable used only once v3: put back temporary variable, as "machine" gets overwritten by the function and loses the original value before we need it. v4: add acked-by, remove redundant assignment config/arm/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 8e892fa77..dddec4e04 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -6,6 +6,7 @@ march_opt = '-march=@0@'.format(machine) arm_force_native_march = false +arm_force_default_march = (machine == 'default') machine_args_generic = [ ['default', ['-march=armv8-a+crc+crypto']], @@ -106,7 +107,10 @@ else cmd_generic = ['generic', '', '', 'default', ''] cmd_output = cmd_generic # Set generic by default machine_args = [] # Clear previous machine args - if not meson.is_cross_build() + if arm_force_default_march and not meson.is_cross_build() + machine = impl_generic + impl_pn = 'default' + elif not meson.is_cross_build() # The script returns ['Implementer', 'Variant', 'Architecture', # 'Primary Part number', 'Revision'] detect_vendor = find_program(join_paths( -- 2.20.1