From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 33DE63858C5E for ; Mon, 3 Apr 2023 10:21:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 33DE63858C5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 3E1231FD8C for ; Mon, 3 Apr 2023 10:21:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680517302; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=q6vrXVWaVt2hAYtOREEGiNThWBcBbPlCAP5bmvQ4JbU=; b=fSQGvIyLW5Tf8KxyYDOpY0nAWIYQyJcWSZJfbb3zQ1GGJhUk1sRzxfY48cdrD4dODucilp yNCy7Yq1VMIOvnBFYCic0NGCV/95ocHfIkmWSaMSuMcnUC4811VyX8WtvuPtFj6oJxPZol 5mB7fM6XOVBpIJXS2WnfHeixjvs38VM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680517302; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=q6vrXVWaVt2hAYtOREEGiNThWBcBbPlCAP5bmvQ4JbU=; b=tAz8kiIaQywY2jIARsm6SF9JIeeeGWH+cHhATTdEIlfZXMxXqmIYCFz7m4f6kAflQ/7Y3s hg6WUnQ+e07Gd1Cw== Received: from hawking.suse.de (unknown [10.168.4.11]) by relay2.suse.de (Postfix) with ESMTP id 348BE2C14F for ; Mon, 3 Apr 2023 10:21:42 +0000 (UTC) Received: by hawking.suse.de (Postfix, from userid 17005) id 27E494A04C4; Mon, 3 Apr 2023 12:21:42 +0200 (CEST) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] x86/dl-cacheinfo: remove unsused parameter from handle_amd X-Yow: Today, THREE WINOS from DETROIT sold me a framed photo of TAB HUNTER before his MAKEOVER! Date: Mon, 03 Apr 2023 12:21:42 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --- sysdeps/x86/dl-cacheinfo.h | 66 +++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h index ab671487da..7e53d146ca 100644 --- a/sysdeps/x86/dl-cacheinfo.h +++ b/sysdeps/x86/dl-cacheinfo.h @@ -311,7 +311,7 @@ handle_intel (int name, const struct cpu_features *cpu_features) static long int __attribute__ ((noinline)) -handle_amd (int name, const struct cpu_features *cpu_features) +handle_amd (int name) { unsigned int eax; unsigned int ebx; @@ -334,24 +334,23 @@ handle_amd (int name, const struct cpu_features *cpu_features) switch (name) { - case _SC_LEVEL1_ICACHE_ASSOC: - case _SC_LEVEL1_DCACHE_ASSOC: - case _SC_LEVEL2_CACHE_ASSOC: - case _SC_LEVEL3_CACHE_ASSOC: - return ecx?((ebx >> 22) & 0x3ff) + 1 : 0; - case _SC_LEVEL1_ICACHE_LINESIZE: - case _SC_LEVEL1_DCACHE_LINESIZE: - case _SC_LEVEL2_CACHE_LINESIZE: - case _SC_LEVEL3_CACHE_LINESIZE: - return ecx?(ebx & 0xfff) + 1 : 0; - case _SC_LEVEL1_ICACHE_SIZE: - case _SC_LEVEL1_DCACHE_SIZE: - case _SC_LEVEL2_CACHE_SIZE: - case _SC_LEVEL3_CACHE_SIZE: - return ecx?(((ebx >> 22) & 0x3ff) + 1)*((ebx & 0xfff) + 1)\ - *(ecx + 1):0; - default: - assert (! "cannot happen"); + case _SC_LEVEL1_ICACHE_ASSOC: + case _SC_LEVEL1_DCACHE_ASSOC: + case _SC_LEVEL2_CACHE_ASSOC: + case _SC_LEVEL3_CACHE_ASSOC: + return ecx ? ((ebx >> 22) & 0x3ff) + 1 : 0; + case _SC_LEVEL1_ICACHE_LINESIZE: + case _SC_LEVEL1_DCACHE_LINESIZE: + case _SC_LEVEL2_CACHE_LINESIZE: + case _SC_LEVEL3_CACHE_LINESIZE: + return ecx ? (ebx & 0xfff) + 1 : 0; + case _SC_LEVEL1_ICACHE_SIZE: + case _SC_LEVEL1_DCACHE_SIZE: + case _SC_LEVEL2_CACHE_SIZE: + case _SC_LEVEL3_CACHE_SIZE: + return ecx ? (((ebx >> 22) & 0x3ff) + 1) * ((ebx & 0xfff) + 1) * (ecx + 1): 0; + default: + assert (! "cannot happen"); } return -1; } @@ -697,30 +696,25 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) } else if (cpu_features->basic.kind == arch_kind_amd) { - data = handle_amd (_SC_LEVEL1_DCACHE_SIZE, cpu_features); - core = handle_amd (_SC_LEVEL2_CACHE_SIZE, cpu_features); - shared = handle_amd (_SC_LEVEL3_CACHE_SIZE, cpu_features); + data = handle_amd (_SC_LEVEL1_DCACHE_SIZE); + core = handle_amd (_SC_LEVEL2_CACHE_SIZE); + shared = handle_amd (_SC_LEVEL3_CACHE_SIZE); - level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE, cpu_features); - level1_icache_linesize - = handle_amd (_SC_LEVEL1_ICACHE_LINESIZE, cpu_features); + level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE); + level1_icache_linesize = handle_amd (_SC_LEVEL1_ICACHE_LINESIZE); level1_dcache_size = data; - level1_dcache_assoc - = handle_amd (_SC_LEVEL1_DCACHE_ASSOC, cpu_features); - level1_dcache_linesize - = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE, cpu_features); + level1_dcache_assoc = handle_amd (_SC_LEVEL1_DCACHE_ASSOC); + level1_dcache_linesize = handle_amd (_SC_LEVEL1_DCACHE_LINESIZE); level2_cache_size = core; - level2_cache_assoc = handle_amd (_SC_LEVEL2_CACHE_ASSOC, cpu_features); - level2_cache_linesize - = handle_amd (_SC_LEVEL2_CACHE_LINESIZE, cpu_features); + level2_cache_assoc = handle_amd (_SC_LEVEL2_CACHE_ASSOC); + level2_cache_linesize = handle_amd (_SC_LEVEL2_CACHE_LINESIZE); level3_cache_size = shared; - level3_cache_assoc = handle_amd (_SC_LEVEL3_CACHE_ASSOC, cpu_features); - level3_cache_linesize - = handle_amd (_SC_LEVEL3_CACHE_LINESIZE, cpu_features); + level3_cache_assoc = handle_amd (_SC_LEVEL3_CACHE_ASSOC); + level3_cache_linesize = handle_amd (_SC_LEVEL3_CACHE_LINESIZE); if (shared <= 0) /* No shared L3 cache. All we have is the L2 cache. */ - shared = core; + shared = core; } cpu_features->level1_icache_size = level1_icache_size; -- 2.40.0 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."