From patchwork Sun Feb 6 00:29:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 50842 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5AF32385800F for ; Sun, 6 Feb 2022 00:31:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AF32385800F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1644107467; bh=j+zjHZnpHuYjkAEcixWd2JbzKMT5CTOYBSH9DGm2ITM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=UZUdzjnYOl2wYCqKhFI55dW0s1CA/pADkhLTOj2BIAhdx2Ifi+Lf/ekGH1+Sbci4P M0Abi7+/Fleg8m16l23Z4J3dbevQGe5YgLSvcWdyQU3+VEj0+v6HxzmnaCEXOkI3EG Ztyy1G+HPoetjPGZfUaggeh6mlqufl0Tv7AiEsW0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 1D94D3858436 for ; Sun, 6 Feb 2022 00:29:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1D94D3858436 Received: by mail-pf1-x433.google.com with SMTP id 192so8451649pfz.3 for ; Sat, 05 Feb 2022 16:29:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=j+zjHZnpHuYjkAEcixWd2JbzKMT5CTOYBSH9DGm2ITM=; b=aUsGA3z6zvdUCdwPIRmlAfUJBYwqyFGEt9eXG+xoFAXyWnQfk4HMEgrBJ6tYDZ6xAJ 9O9qDJW/c6JUNb+rkjYsW2d8Hq6B9abkIF0ZZKITyOgvngFuKK/vpcNLlzGzXJvK64PC nK8HvU80IDkv8YhcrhYp4ersDxbYwbJbLNhpKPgz9Z5RLk4UoVL3OrensclsSdOD1QEV rvBKzPLlWQP2VIe1b4yVqOoQpJvVplURCXcD0VLSlSfiPRkFzHUT4w5PEtC3vlSubH4a BL39jA0YYqItVUkrBmHkVXMAruWvJxxzqurYBxGRpMUTwxpb+wRe/B0jWpbn/by/RagG AJVA== X-Gm-Message-State: AOAM5335iERtQL70sDbAATXinZ3xBf6mhtyutKwmxsOCUuIIldT6M2I+ h9bnWjmTPr9zzPn18qRDe4yRzpCCeoA= X-Google-Smtp-Source: ABdhPJz4WjXQKoALUAClWGcFXcKpqjR2L5Keu+GFSN3LlO2psLwtom+l+2yF8HsS+EF/AtrjNVgrSg== X-Received: by 2002:a05:6a00:10c1:: with SMTP id d1mr9731588pfu.84.1644107394926; Sat, 05 Feb 2022 16:29:54 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.38.240]) by smtp.gmail.com with ESMTPSA id 16sm7315293pfl.99.2022.02.05.16.29.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 16:29:54 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 82373C068E for ; Sat, 5 Feb 2022 16:29:53 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86_64/multiarch: Sort sysdep_routines and put one entry per line Date: Sat, 5 Feb 2022 16:29:53 -0800 Message-Id: <20220206002953.2897890-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- sysdeps/x86_64/multiarch/Makefile | 290 ++++++++++++++++++------------ 1 file changed, 176 insertions(+), 114 deletions(-) diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile index 044778585b..4274bfdd0d 100644 --- a/sysdeps/x86_64/multiarch/Makefile +++ b/sysdeps/x86_64/multiarch/Makefile @@ -1,89 +1,133 @@ ifeq ($(subdir),string) -sysdep_routines += strncat-c stpncpy-c strncpy-c \ - strcmp-sse2 strcmp-sse2-unaligned strcmp-ssse3 \ - strcmp-sse4_2 strcmp-avx2 \ - strncmp-sse2 strncmp-ssse3 strncmp-sse4_2 strncmp-avx2 \ - memchr-sse2 rawmemchr-sse2 memchr-avx2 rawmemchr-avx2 \ - memrchr-sse2 memrchr-avx2 \ - memcmp-sse2 \ - memcmpeq-sse2 \ - memcmp-avx2-movbe \ - memcmpeq-avx2 \ - memcmp-sse4 memcpy-ssse3 \ - memmove-ssse3 \ - memcpy-ssse3-back \ - memmove-ssse3-back \ - memmove-avx512-no-vzeroupper \ - strcasecmp_l-sse2 strcasecmp_l-ssse3 \ - strcasecmp_l-sse4_2 strcasecmp_l-avx \ - strncase_l-sse2 strncase_l-ssse3 \ - strncase_l-sse4_2 strncase_l-avx \ - strchr-sse2 strchrnul-sse2 strchr-avx2 strchrnul-avx2 \ - strrchr-sse2 strrchr-avx2 \ - strlen-sse2 strnlen-sse2 strlen-avx2 strnlen-avx2 \ - strcat-avx2 strncat-avx2 \ - strcat-ssse3 strncat-ssse3\ - strcpy-avx2 strncpy-avx2 \ - strcpy-sse2 stpcpy-sse2 \ - strcpy-ssse3 strncpy-ssse3 stpcpy-ssse3 stpncpy-ssse3 \ - strcpy-sse2-unaligned strncpy-sse2-unaligned \ - stpcpy-sse2-unaligned stpncpy-sse2-unaligned \ - stpcpy-avx2 stpncpy-avx2 \ - strcat-sse2 \ - strcat-sse2-unaligned strncat-sse2-unaligned \ - strchr-sse2-no-bsf memcmp-ssse3 strstr-sse2-unaligned \ - strcspn-sse2 strpbrk-sse2 strspn-sse2 \ - strcspn-c strpbrk-c strspn-c varshift \ - memset-avx512-no-vzeroupper \ - memmove-sse2-unaligned-erms \ - memmove-avx-unaligned-erms \ - memmove-avx512-unaligned-erms \ - memset-sse2-unaligned-erms \ - memset-avx2-unaligned-erms \ - memset-avx512-unaligned-erms \ - memchr-avx2-rtm \ - memcmp-avx2-movbe-rtm \ - memcmpeq-avx2-rtm \ - memmove-avx-unaligned-erms-rtm \ - memrchr-avx2-rtm \ - memset-avx2-unaligned-erms-rtm \ - rawmemchr-avx2-rtm \ - strchr-avx2-rtm \ - strcmp-avx2-rtm \ - strchrnul-avx2-rtm \ - stpcpy-avx2-rtm \ - stpncpy-avx2-rtm \ - strcat-avx2-rtm \ - strcpy-avx2-rtm \ - strlen-avx2-rtm \ - strncat-avx2-rtm \ - strncmp-avx2-rtm \ - strncpy-avx2-rtm \ - strnlen-avx2-rtm \ - strrchr-avx2-rtm \ - memchr-evex \ - memcmp-evex-movbe \ - memcmpeq-evex \ - memmove-evex-unaligned-erms \ - memrchr-evex \ - memset-evex-unaligned-erms \ - rawmemchr-evex \ - stpcpy-evex \ - stpncpy-evex \ - strcat-evex \ - strchr-evex \ - strchrnul-evex \ - strcmp-evex \ - strcpy-evex \ - strlen-evex \ - strncat-evex \ - strncmp-evex \ - strncpy-evex \ - strnlen-evex \ - strrchr-evex \ - memchr-evex-rtm \ - rawmemchr-evex-rtm +sysdep_routines += \ + memchr-avx2 \ + memchr-avx2-rtm \ + memchr-evex \ + memchr-evex-rtm \ + memchr-sse2 \ + memcmp-avx2-movbe \ + memcmp-avx2-movbe-rtm \ + memcmp-evex-movbe \ + memcmp-sse2 \ + memcmp-sse4 \ + memcmp-ssse3 \ + memcmpeq-avx2 \ + memcmpeq-avx2-rtm \ + memcmpeq-evex \ + memcmpeq-sse2 \ + memcpy-ssse3 \ + memcpy-ssse3-back \ + memmove-avx-unaligned-erms \ + memmove-avx-unaligned-erms-rtm \ + memmove-avx512-no-vzeroupper \ + memmove-avx512-unaligned-erms \ + memmove-evex-unaligned-erms \ + memmove-sse2-unaligned-erms \ + memmove-ssse3 \ + memmove-ssse3-back \ + memrchr-avx2 \ + memrchr-avx2-rtm \ + memrchr-evex \ + memrchr-sse2 \ + memset-avx2-unaligned-erms \ + memset-avx2-unaligned-erms-rtm \ + memset-avx512-no-vzeroupper \ + memset-avx512-unaligned-erms \ + memset-evex-unaligned-erms \ + memset-sse2-unaligned-erms \ + rawmemchr-avx2 \ + rawmemchr-avx2-rtm \ + rawmemchr-evex \ + rawmemchr-evex-rtm \ + rawmemchr-sse2 \ + stpcpy-avx2 \ + stpcpy-avx2-rtm \ + stpcpy-evex \ + stpcpy-sse2 \ + stpcpy-sse2-unaligned \ + stpcpy-ssse3 \ + stpncpy-avx2 \ + stpncpy-avx2-rtm \ + stpncpy-c \ + stpncpy-evex \ + stpncpy-sse2-unaligned \ + stpncpy-ssse3 \ + strcasecmp_l-avx \ + strcasecmp_l-sse2 \ + strcasecmp_l-sse4_2 \ + strcasecmp_l-ssse3 \ + strcat-avx2 \ + strcat-avx2-rtm \ + strcat-evex \ + strcat-sse2 \ + strcat-sse2-unaligned \ + strcat-ssse3 \ + strchr-avx2 \ + strchr-avx2-rtm \ + strchr-evex \ + strchr-sse2 \ + strchr-sse2-no-bsf \ + strchrnul-avx2 \ + strchrnul-avx2-rtm \ + strchrnul-evex \ + strchrnul-sse2 \ + strcmp-avx2 \ + strcmp-avx2-rtm \ + strcmp-evex \ + strcmp-sse2 \ + strcmp-sse2-unaligned \ + strcmp-sse4_2 \ + strcmp-ssse3 \ + strcpy-avx2 \ + strcpy-avx2-rtm \ + strcpy-evex \ + strcpy-sse2 \ + strcpy-sse2-unaligned \ + strcpy-ssse3 \ + strcspn-c \ + strcspn-sse2 \ + strlen-avx2 \ + strlen-avx2-rtm \ + strlen-evex \ + strlen-sse2 \ + strncase_l-avx \ + strncase_l-sse2 \ + strncase_l-sse4_2 \ + strncase_l-ssse3 \ + strncat-avx2 \ + strncat-avx2-rtm \ + strncat-c \ + strncat-evex \ + strncat-sse2-unaligned \ + strncat-ssse3 \ + strncmp-avx2 \ + strncmp-avx2-rtm \ + strncmp-evex \ + strncmp-sse2 \ + strncmp-sse4_2 \ + strncmp-ssse3 \ + strncpy-avx2 \ + strncpy-avx2-rtm \ + strncpy-c \ + strncpy-evex \ + strncpy-sse2-unaligned \ + strncpy-ssse3 \ + strnlen-avx2 \ + strnlen-avx2-rtm \ + strnlen-evex \ + strnlen-sse2 \ + strpbrk-c \ + strpbrk-sse2 \ + strrchr-avx2 \ + strrchr-avx2-rtm \ + strrchr-evex \ + strrchr-sse2 \ + strspn-c \ + strspn-sse2 \ + strstr-sse2-unaligned \ + varshift \ +# sysdep_routines CFLAGS-varshift.c += -msse4 CFLAGS-strcspn-c.c += -msse4 CFLAGS-strpbrk-c.c += -msse4 @@ -91,37 +135,55 @@ CFLAGS-strspn-c.c += -msse4 endif ifeq ($(subdir),wcsmbs) -sysdep_routines += wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c \ - wmemcmp-avx2-movbe \ - wmemchr-sse2 wmemchr-avx2 \ - wcscmp-sse2 wcscmp-avx2 \ - wcsncmp-sse2 wcsncmp-avx2 \ - wcscpy-ssse3 wcscpy-c \ - wcschr-sse2 wcschr-avx2 \ - wcsrchr-sse2 wcsrchr-avx2 \ - wcslen-sse2 wcslen-sse4_1 wcslen-avx2 \ - wcsnlen-c wcsnlen-sse4_1 wcsnlen-avx2 \ - wcschr-avx2-rtm \ - wcscmp-avx2-rtm \ - wcslen-avx2-rtm \ - wcsncmp-avx2-rtm \ - wcsnlen-avx2-rtm \ - wcsrchr-avx2-rtm \ - wmemchr-avx2-rtm \ - wmemcmp-avx2-movbe-rtm \ - wcschr-evex \ - wcscmp-evex \ - wcslen-evex \ - wcsncmp-evex \ - wcsnlen-evex \ - wcsrchr-evex \ - wmemchr-evex \ - wmemcmp-evex-movbe \ - wmemchr-evex-rtm +sysdep_routines += \ + wcschr-avx2 \ + wcschr-avx2-rtm \ + wcschr-evex \ + wcschr-sse2 \ + wcscmp-avx2 \ + wcscmp-avx2-rtm \ + wcscmp-evex \ + wcscmp-sse2 \ + wcscpy-c \ + wcscpy-ssse3 \ + wcslen-avx2 \ + wcslen-avx2-rtm \ + wcslen-evex \ + wcslen-sse2 \ + wcslen-sse4_1 \ + wcsncmp-avx2 \ + wcsncmp-avx2-rtm \ + wcsncmp-evex \ + wcsncmp-sse2 \ + wcsnlen-avx2 \ + wcsnlen-avx2-rtm \ + wcsnlen-c \ + wcsnlen-evex \ + wcsnlen-sse4_1 \ + wcsrchr-avx2 \ + wcsrchr-avx2-rtm \ + wcsrchr-evex \ + wcsrchr-sse2 \ + wmemchr-avx2 \ + wmemchr-avx2-rtm \ + wmemchr-evex \ + wmemchr-evex-rtm \ + wmemchr-sse2 \ + wmemcmp-avx2-movbe \ + wmemcmp-avx2-movbe-rtm \ + wmemcmp-c \ + wmemcmp-evex-movbe \ + wmemcmp-sse4 \ + wmemcmp-ssse3 \ +# sysdep_routines endif ifeq ($(subdir),debug) -sysdep_routines += memcpy_chk-nonshared mempcpy_chk-nonshared \ - memmove_chk-nonshared memset_chk-nonshared \ - wmemset_chk-nonshared +sysdep_routines += \ + memcpy_chk-nonshared \ + memmove_chk-nonshared \ + mempcpy_chk-nonshared \ + memset_chk-nonshared \ + wmemset_chk-nonshared \ +# sysdep_routines endif