From patchwork Tue Mar 17 04:46:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: develop--- via Libc-alpha X-Patchwork-Id: 1256048 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=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=FEgi9eRM; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48hLHw4ql7z9sRY for ; Tue, 17 Mar 2020 15:47:24 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7B27A3940CEA; Tue, 17 Mar 2020 04:47:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B27A3940CEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1584420432; bh=BnOjiGs/EkTdyIv+JtQg9s+vu9qNYqhOOBwb6if9uko=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=FEgi9eRMeHIO6yPOSZrw+vlbMvbUqViGf7yAC+tjUTXDq/CZcYQjH0AXvd8hCjQWt cN4R5eCJ4CrxSPR25WfVORD12bYnRBjiCrq3pn1+uHTc/76VlU9OD97weczjw/vJ6+ +lVaip6vxBhDotOHyFUdY3rBmO8V8kEzA0+w+Wy8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by sourceware.org (Postfix) with ESMTPS id D087138A1033 for ; Tue, 17 Mar 2020 04:47:10 +0000 (GMT) Received: by mail-pl1-x643.google.com with SMTP id f16so9058425plj.4 for ; Mon, 16 Mar 2020 21:47:10 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=BnOjiGs/EkTdyIv+JtQg9s+vu9qNYqhOOBwb6if9uko=; b=IeVvhJUqrET52tWubnQIWYxOT97tFRW5COcfDRSmYRge55gmx+bDzeE5poml4vgRvS CsNJQxADp9gYuN6k/dDmnVHqaWt86iNIhoJtPcolZ/ybyyH3v2lEGPQa/hdi1A5FCUdT cF8In6b8zTfcAkmy0iECPU/Ts3zLTa0BBHbPiccs5ST3NBV1Ang81dhBgoSyDnnl1/Ug cnSKnhRsFRXc4YZ2GPiBD7fTV+q1qWflQCUm6E65L1hKh2q7PBEmLMaatvVvVBPsTThh l7ANEnKzMwpqSP0+TsJHpQMxIzyxxJCaJk320hVTqO6DjQ5FKIR/i0Z7UCx3Jfscg5Ux xzAw== X-Gm-Message-State: ANhLgQ00dUTpW5bNdsXUxlGAA7YBmInqg4E5uNr99JtrVzxaZKaLrMFw VGgyIR5hCdwt8ActDpg0JOX3XcVG X-Google-Smtp-Source: ADFU+vsS31fTsgnPTjDNFcVDlQ78whlr7XVrUgIdYYNK4p4aMLSS0VNglqi++cBlh9qtpU3SxF2U1Q== X-Received: by 2002:a17:90a:3a8f:: with SMTP id b15mr3129577pjc.178.1584420429687; Mon, 16 Mar 2020 21:47:09 -0700 (PDT) Received: from Myrtle-ZP-Model0.amd.com.amd.com ([165.204.156.251]) by smtp.gmail.com with ESMTPSA id md20sm1218661pjb.15.2020.03.16.21.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 21:47:09 -0700 (PDT) X-Google-Original-From: Prem Mallappa To: libc-alpha@sourceware.org, codonell@redhat.com, schwab@suse.com, FWeimer@redhat.com Subject: [PATCH 1/3] x86: Refactor platform support in cpu_features Date: Tue, 17 Mar 2020 10:16:44 +0530 Message-Id: <20200317044646.29707-2-PMallappa@amd.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317044646.29707-1-PMallappa@amd.com> References: <20200317044646.29707-1-PMallappa@amd.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.2 required=5.0 tests=DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Prem Mallappa via Libc-alpha From: develop--- via Libc-alpha Reply-To: Prem Mallappa Cc: Prem Mallappa Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Prem Mallappa This is a preliminary support to have platform for AMD processors. Signed-off-by: Prem Mallappa --- sysdeps/x86/cpu-features.c | 99 ++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 81a170a819..a36f385976 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -302,6 +302,58 @@ _Static_assert (((index_arch_Fast_Unaligned_Load == index_arch_Fast_Copy_Backward)), "Incorrect index_arch_Fast_Unaligned_Load"); +static void +set_platform (struct cpu_features *cpu_features) +{ +#ifdef __x86_64__ + const char *platform = NULL; + + GLRO(dl_hwcap) = HWCAP_X86_64; + + if (cpu_features->basic.kind == arch_kind_intel) + { + if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable) + && CPU_FEATURES_CPU_P (cpu_features, AVX512CD)) + { + if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER)) + { + if (CPU_FEATURES_CPU_P (cpu_features, AVX512PF)) + platform = "xeon_phi"; + } + else + { + if (CPU_FEATURES_CPU_P (cpu_features, AVX512BW) + && CPU_FEATURES_CPU_P (cpu_features, AVX512DQ) + && CPU_FEATURES_CPU_P (cpu_features, AVX512VL)) + GLRO(dl_hwcap) |= HWCAP_X86_AVX512_1; + } + } + + if (platform == NULL + && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable) + && CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable) + && CPU_FEATURES_CPU_P (cpu_features, BMI1) + && CPU_FEATURES_CPU_P (cpu_features, BMI2) + && CPU_FEATURES_CPU_P (cpu_features, LZCNT) + && CPU_FEATURES_CPU_P (cpu_features, MOVBE) + && CPU_FEATURES_CPU_P (cpu_features, POPCNT)) + platform = "haswell"; + } + + if (platform != NULL) + GLRO(dl_platform) = platform; +#else + GLRO(dl_hwcap) = 0; + if (CPU_FEATURES_CPU_P (cpu_features, SSE2)) + GLRO(dl_hwcap) |= HWCAP_X86_SSE2; + + if (CPU_FEATURES_ARCH_P (cpu_features, I686)) + GLRO(dl_platform) = "i686"; + else if (CPU_FEATURES_ARCH_P (cpu_features, I586)) + GLRO(dl_platform) = "i586"; +#endif +} + static inline void init_cpu_features (struct cpu_features *cpu_features) { @@ -506,52 +558,7 @@ no_cpuid: GLRO(dl_hwcap_mask) = HWCAP_IMPORTANT; #endif -#ifdef __x86_64__ - GLRO(dl_hwcap) = HWCAP_X86_64; - if (cpu_features->basic.kind == arch_kind_intel) - { - const char *platform = NULL; - - if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable) - && CPU_FEATURES_CPU_P (cpu_features, AVX512CD)) - { - if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER)) - { - if (CPU_FEATURES_CPU_P (cpu_features, AVX512PF)) - platform = "xeon_phi"; - } - else - { - if (CPU_FEATURES_CPU_P (cpu_features, AVX512BW) - && CPU_FEATURES_CPU_P (cpu_features, AVX512DQ) - && CPU_FEATURES_CPU_P (cpu_features, AVX512VL)) - GLRO(dl_hwcap) |= HWCAP_X86_AVX512_1; - } - } - - if (platform == NULL - && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable) - && CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable) - && CPU_FEATURES_CPU_P (cpu_features, BMI1) - && CPU_FEATURES_CPU_P (cpu_features, BMI2) - && CPU_FEATURES_CPU_P (cpu_features, LZCNT) - && CPU_FEATURES_CPU_P (cpu_features, MOVBE) - && CPU_FEATURES_CPU_P (cpu_features, POPCNT)) - platform = "haswell"; - - if (platform != NULL) - GLRO(dl_platform) = platform; - } -#else - GLRO(dl_hwcap) = 0; - if (CPU_FEATURES_CPU_P (cpu_features, SSE2)) - GLRO(dl_hwcap) |= HWCAP_X86_SSE2; - - if (CPU_FEATURES_ARCH_P (cpu_features, I686)) - GLRO(dl_platform) = "i686"; - else if (CPU_FEATURES_ARCH_P (cpu_features, I586)) - GLRO(dl_platform) = "i586"; -#endif + set_platform(cpu_features); #if CET_ENABLED # if HAVE_TUNABLES From patchwork Tue Mar 17 04:46:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: develop--- via Libc-alpha X-Patchwork-Id: 1256049 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=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=yb8FB+fX; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48hLHz2qQ1z9sPF for ; Tue, 17 Mar 2020 15:47:27 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CE1D3942025; Tue, 17 Mar 2020 04:47:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CE1D3942025 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1584420435; bh=fakWsigLNJlsH3gCXmwopWvokNwjKgsTU3YJFyN6Wa8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=yb8FB+fXRembD8TDYNWn7zB/+Z0tk8WacskSVffA3wzw7BgnSGhGySaXlXnqFST8D y5COBPCKEGnii1Hgx2RN+6lG+KR7LgrqjvffWp8sFJikIF0JzNBxWRdhA3yzgImSnB i5Anpm000mXEuAncCsXwdKoK6hTku8+ofuqE3LFU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by sourceware.org (Postfix) with ESMTPS id 0AC283942025 for ; Tue, 17 Mar 2020 04:47:13 +0000 (GMT) Received: by mail-pg1-x544.google.com with SMTP id t24so11011803pgj.7 for ; Mon, 16 Mar 2020 21:47:13 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=fakWsigLNJlsH3gCXmwopWvokNwjKgsTU3YJFyN6Wa8=; b=Qa5bZmnSN9LdTv3ve2GrFo3ZzekpcIXMmRDy1o0H1IqVplsAqoTgBP52XMkYVmCrMd FeiYw4STmVwxc4i5HMvTlPAwUSbV3XVdSpT4lsusKc1qTrJzKhPwl5FF3Hy+A7i6lOlt AHNYHo9MBXks3jkGNUqgUfFjAC6J5UzxGHYM6VFBuaAjKkqdyxyU60xUrgNCZ6KFDP3r sqL/jLC9U4Aec9P66zC3p9ISRwz6O/bbaO+MDLny97QMUSKxfpYR4zla+LdxJ6K3iTu5 xjfwpwicXi97ER+naP37CKPE8vvQqZvODyYoWB9gh8cz/g8xpmKOH5tTG3EqDBhtJJN9 V7gw== X-Gm-Message-State: ANhLgQ2AacVR8O6dageOZFP56VF3nZ6zLkKrsfhlSgAaKS9NSjPhy+zg DwjE9oGo86bjreSyxnEbM5N7GBKE X-Google-Smtp-Source: ADFU+vsB/83634ShR0OTxLADtrGsY0x8tDo3lIDyjvKLDEWO303ArGgDcU8hbYE7Nli6+q/HTlMGXQ== X-Received: by 2002:aa7:828e:: with SMTP id s14mr3093777pfm.15.1584420431882; Mon, 16 Mar 2020 21:47:11 -0700 (PDT) Received: from Myrtle-ZP-Model0.amd.com.amd.com ([165.204.156.251]) by smtp.gmail.com with ESMTPSA id md20sm1218661pjb.15.2020.03.16.21.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 21:47:11 -0700 (PDT) X-Google-Original-From: Prem Mallappa To: libc-alpha@sourceware.org, codonell@redhat.com, schwab@suse.com, FWeimer@redhat.com Subject: [PATCH 2/3] x86: Add AMD Zen and AVX2/AVX platform support Date: Tue, 17 Mar 2020 10:16:45 +0530 Message-Id: <20200317044646.29707-3-PMallappa@amd.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317044646.29707-1-PMallappa@amd.com> References: <20200317044646.29707-1-PMallappa@amd.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.2 required=5.0 tests=DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Prem Mallappa via Libc-alpha From: develop--- via Libc-alpha Reply-To: Prem Mallappa Cc: Prem Mallappa Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Prem Mallappa Priority as below - AVX512 - Haswell/Zen as they are superset of AVX2/AVX - AVX2 - AVX Signed-off-by: Prem Mallappa --- sysdeps/x86/cpu-features.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index a36f385976..2097107968 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -328,20 +328,34 @@ set_platform (struct cpu_features *cpu_features) GLRO(dl_hwcap) |= HWCAP_X86_AVX512_1; } } + } - if (platform == NULL - && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable) - && CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable) - && CPU_FEATURES_CPU_P (cpu_features, BMI1) - && CPU_FEATURES_CPU_P (cpu_features, BMI2) - && CPU_FEATURES_CPU_P (cpu_features, LZCNT) - && CPU_FEATURES_CPU_P (cpu_features, MOVBE) - && CPU_FEATURES_CPU_P (cpu_features, POPCNT)) + if (platform == NULL + && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable) + && CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable) + && CPU_FEATURES_CPU_P (cpu_features, BMI1) + && CPU_FEATURES_CPU_P (cpu_features, BMI2) + && CPU_FEATURES_CPU_P (cpu_features, LZCNT) + && CPU_FEATURES_CPU_P (cpu_features, MOVBE) + && CPU_FEATURES_CPU_P (cpu_features, POPCNT)) + { + if (cpu_features->basic.kind == arch_kind_intel) platform = "haswell"; + else if (cpu_features->basic.kind == arch_kind_amd) + platform = "zen"; } + if (platform == NULL + && CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)) + platform = "generic-avx2"; + + if (platform == NULL + && CPU_FEATURES_ARCH_P (cpu_features, AVX_Usable)) + platform = "generic-avx"; + if (platform != NULL) GLRO(dl_platform) = platform; + #else GLRO(dl_hwcap) = 0; if (CPU_FEATURES_CPU_P (cpu_features, SSE2)) From patchwork Tue Mar 17 04:46:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: develop--- via Libc-alpha X-Patchwork-Id: 1256050 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=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=X9TeotCt; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48hLJ217ybz9sPF for ; Tue, 17 Mar 2020 15:47:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8DAFD394354B; Tue, 17 Mar 2020 04:47:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DAFD394354B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1584420437; bh=dO8Glo5zihTrbSgYz6tjsYspaQfyHYOa91AOWUchYnA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=X9TeotCtL6nwnq+NCFWGNyaeqnYT0b7ic3UyMq2AAyCdvDTczT45NiDe/RAbukdZZ 8Hij6VSaQis2JgzNt/jHki33pWauj4YfWkC4JtxIi6n3x3yiQ9HXouIY7E3RRTDDMi /xFwbYRCsZ1DQWeX/A3xgfRAVVoDmt/3/TUrYtOg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by sourceware.org (Postfix) with ESMTPS id 450D9394354B for ; Tue, 17 Mar 2020 04:47:15 +0000 (GMT) Received: by mail-pg1-x544.google.com with SMTP id a32so10157838pga.4 for ; Mon, 16 Mar 2020 21:47:15 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=dO8Glo5zihTrbSgYz6tjsYspaQfyHYOa91AOWUchYnA=; b=NEjcLdmFSIIxcHjIhfRlhgGJRD+widRnnPLN/aOK6IyRTsFE6fr0RtLJmdVTGk95mc pJcYgEWxc02/Yut3AOXgxqwbH9UKOFTxmAoc1DO4hmzNYxDi1SwNfUi6jCM5184i8zUM hymR2idWBr+1kDPpg4A932P9x4cqV7zQ5oH6ral6RXv/b8RoDAfjEFlTigvxuCgP2i3V F08tY51xU2J+vWRYqqc3Q9Loo+/LPtFuuzE8MXzcgNj914tNqHPpdK9QklWDtqGvp+wz xh9pkp2/6rb68cvV4HBJq8DYbJh/abAyIrrGOg4AQOdNr5dBRPp81m0a7dxLNOGSayBp BjQw== X-Gm-Message-State: ANhLgQ3K5k3RQiwRMboGq/b+9g5QSUetmRjJ6nUQ6dBLNmCvtiBvg2GM bMyiOs+lPrYTHUNRC7qC3FDoxVhr X-Google-Smtp-Source: ADFU+vsDZ7CLmLGptT2iWWGjahpIpTlUB/0qxx4mMs2sdhsuw0bqF3PaUMjf46d70pVHijqSsIFGHw== X-Received: by 2002:a62:170f:: with SMTP id 15mr3165588pfx.12.1584420434094; Mon, 16 Mar 2020 21:47:14 -0700 (PDT) Received: from Myrtle-ZP-Model0.amd.com.amd.com ([165.204.156.251]) by smtp.gmail.com with ESMTPSA id md20sm1218661pjb.15.2020.03.16.21.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 21:47:13 -0700 (PDT) X-Google-Original-From: Prem Mallappa To: libc-alpha@sourceware.org, codonell@redhat.com, schwab@suse.com, FWeimer@redhat.com Subject: [PATCH 3/3] x86: test to load from PLATFORM path Date: Tue, 17 Mar 2020 10:16:46 +0530 Message-Id: <20200317044646.29707-4-PMallappa@amd.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317044646.29707-1-PMallappa@amd.com> References: <20200317044646.29707-1-PMallappa@amd.com> MIME-Version: 1.0 X-Spam-Status: No, score=-25.2 required=5.0 tests=DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Prem Mallappa via Libc-alpha From: develop--- via Libc-alpha Reply-To: Prem Mallappa Cc: Prem Mallappa Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Prem Mallappa Test will load modifier library from new PLATFORM path as well. Signed-off-by: Prem Mallappa --- sysdeps/x86_64/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index d51cf03ac9..b09881b2d7 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -71,6 +71,7 @@ CFLAGS-tst-platformmod-2.c = -mno-avx LDFLAGS-tst-platformmod-2.so = -Wl,-soname,tst-platformmod-2.so $(objpfx)tst-platform-1: $(objpfx)tst-platformmod-1.so $(objpfx)tst-platform-1.out: $(objpfx)x86_64/tst-platformmod-2.so +$(objpfx)tst-platform-1.out: $(objpfx)zen/tst-platformmod-2.so # Turn off AVX512F_Usable and AVX2_Usable so that GLRO(dl_platform) is # always set to x86_64. tst-platform-1-ENV = LD_PRELOAD=$(objpfx)\$$PLATFORM/tst-platformmod-2.so \ @@ -161,7 +162,7 @@ do-tests-clean common-mostlyclean: tst-x86_64-1-clean tst-x86_64-1-clean: -rm -rf $(objpfx)x86_64 -$(objpfx)x86_64/tst-platformmod-2.os: $(objpfx)tst-platformmod-2.os +$(objpfx)%/tst-platformmod-2.os: $(objpfx)tst-platformmod-2.os $(make-target-directory) rm -f $@ ln $< $@