From patchwork Wed Feb 26 19:00:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 868543 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f56:0:b0:38f:210b:807b with SMTP id cm22csp960624wrb; Wed, 26 Feb 2025 11:07:27 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUFArUr3QtZYk2mGapmzXssjzQpxNnl7eN9oESnFEQSf8A0OeMMJNo5UDGDs+LMoXmIaMiWUQ==@linaro.org X-Google-Smtp-Source: AGHT+IGkz8KRJjYF3fjDFhDXKF7YG9cqktDdgh3yKXv0TqDXM0yS2hh2jm6Dh++A8hozi913Wx5Y X-Received: by 2002:a05:6a20:12c5:b0:1ee:7d91:59bd with SMTP id adf61e73a8af0-1f10ae2e106mr7450057637.31.1740596847673; Wed, 26 Feb 2025 11:07:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740596847; cv=pass; d=google.com; s=arc-20240605; b=e4gRsebgZUkWVVzcJsTzgOyk9Sx19teqwvsia5SbwUSZw+QatLmPgDWEaHxkcncIl5 F9QiuyKCkEuituhOp+dnRJ1H+2tt9NU/tkOBr0AdK/4uNoj5YkZ+3sz11FmD+thHT4rh v15Qt8PirO5FkoKAbPSyf+OTXUCO/ITJyyHKLIylI452T68iSdOKsMhk3zNYb++ABbZv uQxyCLZ4N0V63VbHsBvOX6sXxTmXL4A0V8TbPqjB48AyBD6Lpa4dGPPsWOCEBF7ojOsV PopU9bVf64pBmQhfU+aHXCvaT+5BMyZS35dscdT6xxKDeHxF245MNrqytwBbsJSiEfhS xLAA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:dkim-filter:arc-filter:dmarc-filter:delivered-to :dkim-filter; bh=Ul68Jq/eR7WqJp1HCYJwWVBsa5vdvgCwj2JDfVjL1WE=; fh=LwDEXkF2BCfvt5pKmeQEzNeZtO/ktrc/ajkpXRdekFs=; b=cdE9Uxu4R8yaZHRds3VJFSDDMLD+WRfiryTFPqZLjoj5vsLfOEEaNZtBWdFm0pWnHV bk1fzesdLFNEf++tMMOkzPGYxYTGSDgbhvhAw4CRFM8PvmFwBl1bwSvmvSVijJdzDdBM Bz3Ql27GsUiZ8VwKpJvK5smmvHeDXEvg0k0bQGIpXy6lMCw72NxBQId5YmWFnnk52EmI 4qIaPf65kDva7Cip+iDO5cUT9wo5xTCqzu06uXf//QvGvdD6qestAAVmt7++YmtmTH/Z rdvkbb4ZyM1nSs2od2d1YfqWJoG0EoC/CdBmo6Le6VpeaiVLh+YdlS84ERJwkhhL/4Nr jXvw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MRWnBdsb; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id d2e1a72fcca58-7347a6f16cbsi5963953b3a.89.2025.02.26.11.07.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 11:07:27 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MRWnBdsb; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 82C43385840A for ; Wed, 26 Feb 2025 19:07:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82C43385840A Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=MRWnBdsb X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by sourceware.org (Postfix) with ESMTPS id E42BB3858C53 for ; Wed, 26 Feb 2025 19:03:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E42BB3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E42BB3858C53 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1740596602; cv=none; b=tEnGYDZWSiIf2Fmgr0RikkH8jslONlI4WTDx5ebl2+MDGiQX+Ife3AXg692+zYHEKxph8wTHYbYGJTP6MFiOLPPT6QMNVmRISuRjouQapYWC09yTkbShcGPsDakdoVZQ3ETr+RphWayNa1iW5BxDoabsqp4f3MtozsoGQSHVswI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1740596602; c=relaxed/simple; bh=9rR9V9KfMuy2+xn/MJw6752/OFBfG30eS/V2AyJodGA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GJJz1tKtLgdnqFLX2f72y+oyoRRQsJZfpO8HZRnzx0mqUipb4Hn048pnkVwJzZthWwCHi3rUeb+16BEK4zFE4PeQ8lJK0IabXxCGwNBoRVTSVRNHEZZpPs1BTROve7atbBhmmCkyOwbKpzujWyfiS4FTNv24u5Yx5R6NwuhdejI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E42BB3858C53 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-22128b7d587so1456835ad.3 for ; Wed, 26 Feb 2025 11:03:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740596601; x=1741201401; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ul68Jq/eR7WqJp1HCYJwWVBsa5vdvgCwj2JDfVjL1WE=; b=MRWnBdsb3Om6f2Fre+/gaMgkib4qB8gndWQTKnfdqwKxfmMB0qTDwEsmbZgow4MvGa nvwHw9hqhTNp+Wgfc7l85ObSKh+lF/kYo5Ehljd8ztVHwYTWcPg28wPk0pE5RwzarYnA tVXi0/Pr8FCi5qUYr6SBq4p9GLQ85+rBRyRSI9KLm3SAEIsvTJTq4XRJslwPk2cQA9x9 i+gss1TWf+QWnej8Qm6D6ZHGt0TmLdOMghvYUUmpsfq6DKxO0ax0qQrhAQH1DLm0TzJs wEq6PziPhwSrGrlnKgGc02OM2ySOFDE/KRjaIjRpUM29IZLKrwF0bOgJbvK7eEIb/hBW hiXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740596601; x=1741201401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ul68Jq/eR7WqJp1HCYJwWVBsa5vdvgCwj2JDfVjL1WE=; b=Ey5l7fCykzPm25r3f/v2RNjncCyG2NtWCeDEg/PmVpvl6+hmjw/6glxNz+yQNfcMib vyq5NfdHAe0JA4rt9fvXqEfMN4G98M/G5IoD22wvYHa+LxuLsIElSLxzbm1mmfbtpZWO AyL1LL5Mf/nNDIZWOkZ4jWsGLqxyo311ESzbbNC/YylhX6TI0+1ZJPlaJHikNQiPbjsx lBEM8dnOPmnAl8VsMQzCl+w791Vm1V/V/6ix7dPCx0kRv82/GRmFxlaufU3GBSwCl81v Aww0pe3Z9nyv+KoMlbfNIbE+muk9qOJrgbsYHTuBJEB9i0GqBPmR0PZQyAw+h2vOrUcr vcFQ== X-Gm-Message-State: AOJu0Yy5J4V0dzS6283sqGqJTh0o12BX7MwoUpVeLPoILpao92n+iqzu +6EqSYB3NbjgZmnD5+PsZGM52xEZd008ymNNcp502de1hjuUioSK6/wWFK1gRALPa9GwpOzu41l P X-Gm-Gg: ASbGncvpFmYTohmo/UZ5gMsUUV4odtcpR69uWMeoTUqrGFXjV3SrCoyI9FvOCfpFwwd Oq+ZGQea3dmgbc0689/rLhOsQ+6EBBEj1wVL/MfA2KshwWjbFnPilAFnWf2w2920AHK5tT82DCc TGg9N9Sex8YChcjclFQltji6wfcIMhVpiR4SN7Nc3T4Gj1NJ0UKKuHQX2pwWvZG/CeUG37IrDbT q945ynG5vZno6ppqKGblRmUc7bLJ46fk26241WdF7P8fjzSCkl84VtDeG+AQ7Vh5lcSr3N6P9vv cHSpwRVEugdH/fU2PTCuLo4ID6hKdNw2Ck2s6xg= X-Received: by 2002:a17:903:a46:b0:220:f449:7415 with SMTP id d9443c01a7336-22320208605mr57998795ad.44.1740596600645; Wed, 26 Feb 2025 11:03:20 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:f704:a0c6:9418:957f:d5bf]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22344c837e2sm6946185ad.139.2025.02.26.11.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 11:03:20 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Stefan Liebler , Peter Bergner , Wilco Dijkstra Subject: [PATCH 3/6] powerpc: Move cache geometry information to ld diagnostics Date: Wed, 26 Feb 2025 16:00:19 -0300 Message-ID: <20250226190308.2163908-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250226190308.2163908-1-adhemerval.zanella@linaro.org> References: <20250226190308.2163908-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patch=linaro.org@sourceware.org >From LD_SHOW_AUXV output. Checked on powerpc64le-linux-gnu. --- sysdeps/powerpc/dl-diagnostics-cpu.c | 49 ++++++++++++++++++++ sysdeps/powerpc/dl-procinfo.h | 67 +--------------------------- 2 files changed, 50 insertions(+), 66 deletions(-) diff --git a/sysdeps/powerpc/dl-diagnostics-cpu.c b/sysdeps/powerpc/dl-diagnostics-cpu.c index db8d19c7ec..6e7a5302fd 100644 --- a/sysdeps/powerpc/dl-diagnostics-cpu.c +++ b/sysdeps/powerpc/dl-diagnostics-cpu.c @@ -38,6 +38,38 @@ print_hwcap_value (const char *label, int hwcap, unsigned long int value) _dl_printf ("\"\n"); } +static void +print_cache_geometry_value (const char *label, unsigned long int geometry) +{ + unsigned long int assocty, line; + + _dl_printf ("powerpc.cpu_features.%s=\"", label); + + line = geometry & 0xffff; + assocty = (geometry >> 16) & 0xffff; + + if (line == 0) + _dl_printf ("Unknown line size, "); + else + _dl_printf ("%luB line size, ", line); + + switch (assocty) + { + case 0: + _dl_printf ("Unknown associativity"); + break; + case 1: + _dl_printf ("Directly mapped"); + break; + case 0xffff: + _dl_printf ("Fully associative"); + break; + default: + _dl_printf ("%lu-way set associative", assocty); + } + _dl_printf ("\"\n"); +} + void _dl_diagnostics_cpu (void) { @@ -45,4 +77,21 @@ _dl_diagnostics_cpu (void) print_hwcap_value ("hwcap2", AT_HWCAP2, GLRO(dl_hwcap2)); print_hwcap_value ("hwcap3", AT_HWCAP3, GLRO(dl_hwcap3)); print_hwcap_value ("hwcap4", AT_HWCAP4, GLRO(dl_hwcap4)); + + for (ElfW(auxv_t) *av = GLRO(dl_auxv); av->a_type != AT_NULL; ++av) + switch (av->a_type) + { + case AT_L1I_CACHEGEOMETRY: + print_cache_geometry_value ("l1i_cachegeometry", av->a_un.a_val); + break; + case AT_L1D_CACHEGEOMETRY: + print_cache_geometry_value ("l1d_cachegeometry", av->a_un.a_val); + break; + case AT_L2_CACHEGEOMETRY: + print_cache_geometry_value ("l2_cachegeometry", av->a_un.a_val); + break; + case AT_L3_CACHEGEOMETRY: + print_cache_geometry_value ("l3_cachegeometry", av->a_un.a_val); + break; + } } diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index 04bbe7ba1c..adb1c6994e 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -124,71 +124,6 @@ _dl_string_platform (const char *str) return -1; } -#if IS_IN (rtld) -static inline void -cache_geometry (const char * name, unsigned long int geometry) -{ - unsigned long int assocty, line; - - _dl_printf ("%s", name); - - line = geometry & 0xffff; - assocty = (geometry >> 16) & 0xffff; - - if (line == 0) - _dl_printf ("Unknown line size, "); - else - _dl_printf ("%luB line size, ", line); - - switch (assocty) - { - case 0: - _dl_printf ("Unknown associativity"); - break; - case 1: - _dl_printf ("Directly mapped"); - break; - case 0xffff: - _dl_printf ("Fully associative"); - break; - default: - _dl_printf ("%lu-way set associative", assocty); - } -} - -static inline int -__attribute__ ((unused)) -_dl_procinfo (unsigned int type, unsigned long int word) -{ - switch(type) - { - case AT_L1I_CACHEGEOMETRY: - { - cache_geometry ("AT_L1I_CACHEGEOMETRY: ", word); - break; - } - case AT_L1D_CACHEGEOMETRY: - { - cache_geometry ("AT_L1D_CACHEGEOMETRY: ", word); - break; - } - case AT_L2_CACHEGEOMETRY: - { - cache_geometry ("AT_L2_CACHEGEOMETRY: ", word); - break; - } - case AT_L3_CACHEGEOMETRY: - { - cache_geometry ("AT_L3_CACHEGEOMETRY: ", word); - break; - } - default: - /* Fallback to generic output mechanism. */ - return -1; - } - _dl_printf ("\n"); - return 0; -} -#endif +#define _dl_procinfo(type, word) -1 #endif /* dl-procinfo.h */