From patchwork Wed Mar 15 19:13:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 13176579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B247CC61DA4 for ; Wed, 15 Mar 2023 19:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232662AbjCOTNs (ORCPT ); Wed, 15 Mar 2023 15:13:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232286AbjCOTNr (ORCPT ); Wed, 15 Mar 2023 15:13:47 -0400 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFAD05BCBA for ; Wed, 15 Mar 2023 12:13:45 -0700 (PDT) Received: by mail-io1-xd29.google.com with SMTP id d12so8279699ioe.10 for ; Wed, 15 Mar 2023 12:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678907625; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=firYEzbau1rz6AMyjSnozTL0huc7Ka/bTTQHHSELIcM=; b=ahkGL9mWozK9Fh7UVDY4m6Z2dMJAV/mrqOUudt6rQB3Dusc9QD5Rb7YOKdxag/SwVk 6Cr43zbtOQKH9gG9VSHMsUqLuoUG72ET6u/Eh1UXG9ubwH/e0NlRJrOfRCoS66sNBhNm erkW6PTZZOShNZ5njLJSGBnTWproyBexd7qgw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678907625; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=firYEzbau1rz6AMyjSnozTL0huc7Ka/bTTQHHSELIcM=; b=Ao0hDXXSsICumh6IlGza4sJW8TvzYOOrIT6KTbr+MEt8rbqAByEcbLqBE8IpFGlBkL xeKIAPthktP38V/U0XrBf9eFumFQDrSN8s24ETB046DhWNFiKSNtBKWppR57hhOiVZLZ seHHYW4oJmIXu2CjWK5D//kVMIE2nuqm3RMEAdw8tIatFfAXKFy0FswEIajlPt9SGQF6 nrGyLtBRbIzWJ/vDgh99fXlTTw5V9VcWfl2BU1PNLQgSb7UokGflIFPRg0Gze6n4OKDy IC/xaMPGyb0Q5jgcIFoP+Te8r14gAGeo3I5uK14FWZqbuykISyIYmkmW1Vocql3JhD8W 0gyw== X-Gm-Message-State: AO0yUKVTlGkayYXGhqDyrHqzIP6hvE6Ox5LlVfNImsd0GEjQZOTh/y1p BAb53LqnkSjGLkSj8ysLJjqQcw== X-Google-Smtp-Source: AK7set/zOrC+SqU1C1NY5pRRTThFsnPaeJlYzvQulzJXyr/ibXOKCTYZROERd0iq/yYK2iawIYB60w== X-Received: by 2002:a6b:dd0c:0:b0:74c:99e8:7f44 with SMTP id f12-20020a6bdd0c000000b0074c99e87f44mr206821ioc.2.1678907624971; Wed, 15 Mar 2023 12:13:44 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id g16-20020a02b710000000b004038a45ad89sm1898111jam.85.2023.03.15.12.13.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Mar 2023 12:13:44 -0700 (PDT) Message-ID: <2628e459-597b-3ab7-f330-e0f4659f3efc@linuxfoundation.org> Date: Wed, 15 Mar 2023 13:13:43 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: Linus Torvalds Cc: Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org From: Shuah Khan Subject: [GIT PULL] Kselftest fixes update for Linux 6.3-rc3 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Hi Linus, Please pull the following Kselftest fixes update for Linux 6.3-rc3. This kselftest fixes update for Linux 6.3-rc3 consists of a fix to amd-pstate test Makefile and a fix to LLVM build for i386 and x86_64 in kselftest common lib.mk. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-fixes-6.3-rc3 for you to fetch changes up to 624c60f326c6e5a80b008e8a5c7feffe8c27dc72: selftests: fix LLVM build for i386 and x86_64 (2023-03-10 13:41:10 -0700) ---------------------------------------------------------------- linux-kselftest-fixes-6.3-rc3 This kselftest fixes update for Linux 6.3-rc3 consists of a fix to amd-pstate test Makefile and a fix to LLVM build for i386 and x86_64 in kselftest common lib.mk. ---------------------------------------------------------------- Guillaume Tucker (2): selftests: amd-pstate: fix TEST_FILES selftests: fix LLVM build for i386 and x86_64 tools/testing/selftests/amd-pstate/Makefile | 13 +++++++++---- tools/testing/selftests/lib.mk | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------- diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile index 5fd1424db37d..c382f579fe94 100644 --- a/tools/testing/selftests/amd-pstate/Makefile +++ b/tools/testing/selftests/amd-pstate/Makefile @@ -4,10 +4,15 @@ # No binaries, but make sure arg-less "make" doesn't trigger "run_tests" all: -uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) +ARCH ?= $(shell uname -m 2>/dev/null || echo not) +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -TEST_PROGS := run.sh -TEST_FILES := basic.sh tbench.sh gitsource.sh +ifeq (x86,$(ARCH)) +TEST_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py +TEST_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py +endif + +TEST_PROGS += run.sh +TEST_FILES += basic.sh tbench.sh gitsource.sh include ../lib.mk diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index f7900e75d230..05400462c779 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -10,12 +10,14 @@ endif CLANG_TARGET_FLAGS_arm := arm-linux-gnueabi CLANG_TARGET_FLAGS_arm64 := aarch64-linux-gnu CLANG_TARGET_FLAGS_hexagon := hexagon-linux-musl +CLANG_TARGET_FLAGS_i386 := i386-linux-gnu CLANG_TARGET_FLAGS_m68k := m68k-linux-gnu CLANG_TARGET_FLAGS_mips := mipsel-linux-gnu CLANG_TARGET_FLAGS_powerpc := powerpc64le-linux-gnu CLANG_TARGET_FLAGS_riscv := riscv64-linux-gnu CLANG_TARGET_FLAGS_s390 := s390x-linux-gnu CLANG_TARGET_FLAGS_x86 := x86_64-linux-gnu +CLANG_TARGET_FLAGS_x86_64 := x86_64-linux-gnu CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) ifeq ($(CROSS_COMPILE),)