From patchwork Tue Apr 1 12:18:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 14034751 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62DD9C36018 for ; Tue, 1 Apr 2025 12:19:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C163110E374; Tue, 1 Apr 2025 12:19:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e96vg1qO"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 701FD10E2DE; Tue, 1 Apr 2025 12:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743509940; x=1775045940; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jT6ExL+POLRIZkDCDeOJqvP819AIWXO6Td1/S/GF2sE=; b=e96vg1qOnf+yI08bnplalZT5109ylK+NHpEgbclOLcYu+xFzKooLupgj D3gzRC7tGTjd56ZVvKTg5QvnIOpILeDfhgGHzH6zr4OWCwcT4nB0+58QD WMi1e4j8ZZV1MTE1EMJaxohYXNkvWmmWog//J8Kd22jicHT24cc6lEbVi g8OQ03V3wFnl0WqmaTw/pivypKQzVnwoECoLySwH1tRESQDqN4tj6izLR I0LVbzU2KSfas4CIRwKzAQAQiR5UkZqJzT/IN9I4Ag7iRI+N+ew9LWktq VzUD+ZUtcOl+jHXs0YDGKP/xLnNZdKp0+sjz+MESC/o2FKh8jHaPLit4w A==; X-CSE-ConnectionGUID: gdfcxY9YRFi4yWeYBcvF3A== X-CSE-MsgGUID: k9GDYq5DQj+/NvPYI2xTHg== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="70186967" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="70186967" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:19:00 -0700 X-CSE-ConnectionGUID: 2eNsLzwHTH2xvgeR6joxnA== X-CSE-MsgGUID: 0OVOkFVaQSKzuJtY65XBNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131373437" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.7]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 05:18:56 -0700 From: Jani Nikula To: Linus Torvalds , linux-kernel@vger.kernel.org Cc: jani.nikula@intel.com, Lucas De Marchi , Masahiro Yamada , David Airlie , Daniel Vetter , linux-kbuild@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 2/5] drm/xe: place header test files in .hdrtest subdirectories Date: Tue, 1 Apr 2025 15:18:27 +0300 Message-Id: <20250401121830.21696-3-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401121830.21696-1-jani.nikula@intel.com> References: <20250401121830.21696-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The header tests track whether headers have been checked using empty *.hdrtest files in the build tree. This pollutes the build directories, as the files live in the same "name space" as the real output files, messing with TAB completion among other things. Hide the disgusting turds by placing them in .hdrtest subdirectories. Change the quiet command output to simply $< instead of trying to decode roughly the same from the increasingly complicated $@. Note that it would be somewhat nicer to have the basename of the .hdrtest files be dot-prefixed instead of using subdirectories. However, it's challenging to come up with a pattern rule for that, as we can list headers to test in the subdirectories of $(src) too, without requiring Makefiles and kbuild to descend to each of them. Reported-by: Linus Torvalds Closes: https://lore.kernel.org/r/CAHk-=wjMrqzuUmH-mFbR_46EWEFS=bB=J7h9ABMVy56Vi81PKQ@mail.gmail.com Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") Cc: Lucas De Marchi Cc: Masahiro Yamada Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Jani Nikula --- Cc: linux-kbuild@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- drivers/gpu/drm/xe/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 9699b08585f7..2029c3b5aa5c 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -327,12 +327,12 @@ ifneq ($(CONFIG_DRM_XE_DISPLAY),y) endif always-$(CONFIG_DRM_XE_WERROR) += \ - $(patsubst %.h,%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args))) + $(patsubst %.h,.hdrtest/%.hdrtest, $(shell cd $(src) && find * -name '*.h' $(hdrtest_find_args))) -quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@) +quiet_cmd_hdrtest = HDRTEST $< cmd_hdrtest = $(CC) -DHDRTEST $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; touch $@ -$(obj)/%.hdrtest: $(src)/%.h FORCE +$(obj)/.hdrtest/%.hdrtest: $(src)/%.h FORCE $(call if_changed_dep,hdrtest) uses_generated_oob := $(addprefix $(obj)/, $(xe-y))