* [RFC 1/3] kbuild: add support for ensuring headers are self-contained
@ 2019-05-16 19:48 Jani Nikula
2019-05-16 19:48 ` [RFC 2/3] drm/i915: ensure headers remain self-contained Jani Nikula
` (8 more replies)
0 siblings, 9 replies; 16+ messages in thread
From: Jani Nikula @ 2019-05-16 19:48 UTC (permalink / raw)
To: linux-kbuild
Cc: Michal Marek, jani.nikula, intel-gfx, linux-kernel,
Masahiro Yamada
Sometimes it's useful to be able to explicitly ensure certain headers
remain self-contained, i.e. that they are compilable as standalone
units, by including and/or forward declaring everything they depend on.
Add special target header-test-y where individual Makefiles can add
headers to be tested if CONFIG_HEADER_TEST is enabled. This will
generate a dummy C file per header that gets built as part of extra-y.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Documentation/kbuild/makefiles.txt | 7 +++++++
init/Kconfig | 9 +++++++++
scripts/Makefile.build | 10 ++++++++++
scripts/Makefile.lib | 3 +++
4 files changed, 29 insertions(+)
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 03c065855eaf..73df58e5ea0c 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -1036,6 +1036,13 @@ When kbuild executes, the following steps are followed (roughly):
In this example, extra-y is used to list object files that
shall be built, but shall not be linked as part of built-in.a.
+ header-test-y
+
+ header-test-y specifies headers (*.h) in the current directory that
+ should be compile tested to ensure they are self-contained,
+ i.e. compilable as standalone units. If CONFIG_HEADER_TEST is enabled,
+ this autogenerates dummy sources to include the headers, and builds them
+ as part of extra-y.
--- 6.7 Commands useful for building a boot image
diff --git a/init/Kconfig b/init/Kconfig
index 4592bf7997c0..d91b157201b1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -95,6 +95,15 @@ config COMPILE_TEST
here. If you are a user/distributor, say N here to exclude useless
drivers to be distributed.
+config HEADER_TEST
+ bool "Compile test headers that should be standalone compilable"
+ help
+ Compile test headers listed in header-test-y target to ensure they are
+ self-contained, i.e. compilable as standalone units.
+
+ If you are a developer or tester and want to ensure the requested
+ headers are self-contained, say Y here. Otherwise, choose N.
+
config LOCALVERSION
string "Local version - append to kernel release"
help
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 76ca30cc4791..4d4bf698467a 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -291,6 +291,16 @@ quiet_cmd_cc_lst_c = MKLST $@
$(obj)/%.lst: $(src)/%.c FORCE
$(call if_changed_dep,cc_lst_c)
+# Dummy C sources for header test (header-test-y target)
+# ---------------------------------------------------------------------------
+
+quiet_cmd_header_test = HDRTEST $@
+ cmd_header_test = echo "\#include \"$(<F)\"" > $@
+
+# FIXME: would be nice to be able to limit this implicit rule to header-test-y
+$(obj)/%.header_test.c: $(src)/%.h FORCE
+ $(call if_changed,header_test)
+
# Compile assembler sources (.S)
# ---------------------------------------------------------------------------
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 8a1f64f17740..c2839de06485 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -66,6 +66,9 @@ extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
endif
+# Test self-contained headers
+extra-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.o,$(header-test-y))
+
# Add subdir path
extra-y := $(addprefix $(obj)/,$(extra-y))
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC 2/3] drm/i915: ensure headers remain self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
@ 2019-05-16 19:48 ` Jani Nikula
2019-05-16 19:48 ` [RFC 3/3] DO NOT MERGE: drm/i915: add failing header to header-test-y Jani Nikula
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Jani Nikula @ 2019-05-16 19:48 UTC (permalink / raw)
To: linux-kbuild
Cc: Michal Marek, jani.nikula, intel-gfx, linux-kernel,
Masahiro Yamada
Use the new header test facility.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 1787e1299b1b..05d01a3830d0 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -204,3 +204,6 @@ i915-y += intel_lpe_audio.o
obj-$(CONFIG_DRM_I915) += i915.o
obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
+
+header-test-y := \
+ i915_drv.h
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC 3/3] DO NOT MERGE: drm/i915: add failing header to header-test-y
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
2019-05-16 19:48 ` [RFC 2/3] drm/i915: ensure headers remain self-contained Jani Nikula
@ 2019-05-16 19:48 ` Jani Nikula
2019-05-16 20:12 ` ✗ Fi.CI.SPARSE: warning for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained Patchwork
` (6 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Jani Nikula @ 2019-05-16 19:48 UTC (permalink / raw)
To: linux-kbuild
Cc: linux-kernel, intel-gfx, jani.nikula, Chris Wilson,
Masahiro Yamada, Michal Marek
Demonstrate build failure on a header that is not self-contained.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 05d01a3830d0..fcebf453c9ed 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -206,4 +206,5 @@ obj-$(CONFIG_DRM_I915) += i915.o
obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
header-test-y := \
+ i915_fixed.h \
i915_drv.h
--
2.20.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* ✗ Fi.CI.SPARSE: warning for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
2019-05-16 19:48 ` [RFC 2/3] drm/i915: ensure headers remain self-contained Jani Nikula
2019-05-16 19:48 ` [RFC 3/3] DO NOT MERGE: drm/i915: add failing header to header-test-y Jani Nikula
@ 2019-05-16 20:12 ` Patchwork
2019-05-16 20:31 ` ✓ Fi.CI.BAT: success " Patchwork
` (5 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2019-05-16 20:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained
URL : https://patchwork.freedesktop.org/series/60738/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: kbuild: add support for ensuring headers are self-contained
+Error in reading or end of file.
Commit: drm/i915: ensure headers remain self-contained
Okay!
Commit: DO NOT MERGE: drm/i915: add failing header to header-test-y
Okay!
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
` (2 preceding siblings ...)
2019-05-16 20:12 ` ✗ Fi.CI.SPARSE: warning for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained Patchwork
@ 2019-05-16 20:31 ` Patchwork
2019-05-17 3:54 ` ✓ Fi.CI.IGT: " Patchwork
` (4 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2019-05-16 20:31 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained
URL : https://patchwork.freedesktop.org/series/60738/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6091 -> Patchwork_13027
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13027:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_basic@basic-blt:
- {fi-cml-u}: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-cml-u/igt@gem_exec_basic@basic-blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-cml-u/igt@gem_exec_basic@basic-blt.html
Known issues
------------
Here are the changes found in Patchwork_13027 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: [PASS][3] -> [DMESG-WARN][4] ([fdo#108965])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [PASS][5] -> [INCOMPLETE][6] ([fdo#107718])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_hangcheck:
- fi-apl-guc: [PASS][7] -> [INCOMPLETE][8] ([fdo#103927] / [fdo#110624])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [FAIL][9] ([fdo#108511]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: [DMESG-FAIL][11] ([fdo#110235]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][13] ([fdo#102614]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: [DMESG-WARN][15] ([fdo#106387]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/fi-ilk-650/igt@prime_vgem@basic-fence-flip.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/fi-ilk-650/igt@prime_vgem@basic-fence-flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#110235]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
[fdo#110624]: https://bugs.freedesktop.org/show_bug.cgi?id=110624
Participating hosts (50 -> 43)
------------------------------
Additional (1): fi-pnv-d510
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6091 -> Patchwork_13027
CI_DRM_6091: 0ad895242a8e957336088625a9a6ba48ab838ec9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4994: 555019f862c35f1619627761d6da21385be40920 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13027: 01f606aff618932547f3d16320d0334dd8cf2989 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
01f606aff618 DO NOT MERGE: drm/i915: add failing header to header-test-y
916ec1935ae8 drm/i915: ensure headers remain self-contained
78ee211df3eb kbuild: add support for ensuring headers are self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* ✓ Fi.CI.IGT: success for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
` (3 preceding siblings ...)
2019-05-16 20:31 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-05-17 3:54 ` Patchwork
2019-05-17 8:35 ` [RFC 1/3] " Chris Wilson
` (3 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2019-05-17 3:54 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained
URL : https://patchwork.freedesktop.org/series/60738/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6091_full -> Patchwork_13027_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13027_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [PASS][1] -> [FAIL][2] ([fdo#105363])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-glk9/igt@kms_flip@flip-vs-expired-vblank.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-glk9/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
- shard-iclb: [PASS][3] -> [FAIL][4] ([fdo#103167]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][5] -> [FAIL][6] ([fdo#108145] / [fdo#110403])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-skl7/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [PASS][7] -> [FAIL][8] ([fdo#103166])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-y.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb1/igt@kms_plane_lowres@pipe-a-tiling-y.html
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][9] -> [FAIL][10] ([fdo#108341])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb7/igt@kms_psr@no_drrs.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109441])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb7/igt@kms_psr@psr2_no_drrs.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#108566]) +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-apl1/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-apl8/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
- shard-kbl: [PASS][15] -> [DMESG-WARN][16] ([fdo#108566])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-kbl1/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-kbl7/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
#### Possible fixes ####
* igt@i915_pm_rpm@gem-mmap-gtt:
- shard-iclb: [INCOMPLETE][17] ([fdo#107713] / [fdo#108840]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb7/igt@i915_pm_rpm@gem-mmap-gtt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb6/igt@i915_pm_rpm@gem-mmap-gtt.html
* igt@i915_pm_rpm@reg-read-ioctl:
- shard-skl: [INCOMPLETE][19] ([fdo#107807]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-skl5/igt@i915_pm_rpm@reg-read-ioctl.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-skl3/igt@i915_pm_rpm@reg-read-ioctl.html
* igt@i915_suspend@forcewake:
- shard-skl: [INCOMPLETE][21] ([fdo#104108] / [fdo#107773]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-skl9/igt@i915_suspend@forcewake.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-skl3/igt@i915_suspend@forcewake.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][23] ([fdo#103167]) -> [PASS][24] +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-apl: [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-apl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-apl8/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-kbl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][29] ([fdo#108145] / [fdo#110403]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-skl6/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-skl3/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][31] ([fdo#108145]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
* igt@kms_plane_cursor@pipe-a-primary-size-64:
- shard-iclb: [INCOMPLETE][33] ([fdo#107713]) -> [PASS][34] +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb1/igt@kms_plane_cursor@pipe-a-primary-size-64.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb1/igt@kms_plane_cursor@pipe-a-primary-size-64.html
* igt@kms_psr@psr2_dpms:
- shard-iclb: [SKIP][35] ([fdo#109441]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb7/igt@kms_psr@psr2_dpms.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb2/igt@kms_psr@psr2_dpms.html
#### Warnings ####
* igt@gem_mmap_gtt@forked-big-copy:
- shard-iclb: [TIMEOUT][37] ([fdo#109673]) -> [INCOMPLETE][38] ([fdo#107713] / [fdo#109100])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb6/igt@gem_mmap_gtt@forked-big-copy.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb4/igt@gem_mmap_gtt@forked-big-copy.html
* igt@kms_chamelium@hdmi-hpd-after-suspend:
- shard-iclb: [INCOMPLETE][39] ([fdo#107713]) -> [SKIP][40] ([fdo#109284])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6091/shard-iclb7/igt@kms_chamelium@hdmi-hpd-after-suspend.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/shard-iclb1/igt@kms_chamelium@hdmi-hpd-after-suspend.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6091 -> Patchwork_13027
CI_DRM_6091: 0ad895242a8e957336088625a9a6ba48ab838ec9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4994: 555019f862c35f1619627761d6da21385be40920 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13027: 01f606aff618932547f3d16320d0334dd8cf2989 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13027/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
` (4 preceding siblings ...)
2019-05-17 3:54 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-05-17 8:35 ` Chris Wilson
2019-05-18 5:29 ` Masahiro Yamada
2019-05-18 5:16 ` Masahiro Yamada
` (2 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Chris Wilson @ 2019-05-17 8:35 UTC (permalink / raw)
To: linux-kbuild
Cc: jani.nikula, Masahiro Yamada, intel-gfx, Michal Marek,
linux-kernel
Quoting Jani Nikula (2019-05-16 20:48:16)
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 8a1f64f17740..c2839de06485 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -66,6 +66,9 @@ extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> endif
>
> +# Test self-contained headers
> +extra-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.o,$(header-test-y))
This didn't get pulled into clean-files.
clean-files-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.c,$(header-test-y))
?
Not enough. Nor is clean-files-y +=...
And it should also be put into the global gitignore I think.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
` (5 preceding siblings ...)
2019-05-17 8:35 ` [RFC 1/3] " Chris Wilson
@ 2019-05-18 5:16 ` Masahiro Yamada
2019-05-20 9:20 ` [Intel-gfx] " Jani Nikula
2019-05-24 17:40 ` Sam Ravnborg
2019-05-26 14:01 ` ✗ Fi.CI.BAT: failure for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained (rev2) Patchwork
8 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2019-05-18 5:16 UTC (permalink / raw)
To: Jani Nikula
Cc: Linux Kbuild mailing list, Linux Kernel Mailing List, intel-gfx,
Chris Wilson, Michal Marek
On Fri, May 17, 2019 at 4:48 AM Jani Nikula <jani.nikula@intel.com> wrote:
>
> Sometimes it's useful to be able to explicitly ensure certain headers
> remain self-contained, i.e. that they are compilable as standalone
> units, by including and/or forward declaring everything they depend on.
>
> Add special target header-test-y where individual Makefiles can add
> headers to be tested if CONFIG_HEADER_TEST is enabled. This will
> generate a dummy C file per header that gets built as part of extra-y.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Michal Marek <michal.lkml@markovi.net>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> Documentation/kbuild/makefiles.txt | 7 +++++++
> init/Kconfig | 9 +++++++++
> scripts/Makefile.build | 10 ++++++++++
> scripts/Makefile.lib | 3 +++
> 4 files changed, 29 insertions(+)
>
> diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
> index 03c065855eaf..73df58e5ea0c 100644
> --- a/Documentation/kbuild/makefiles.txt
> +++ b/Documentation/kbuild/makefiles.txt
> @@ -1036,6 +1036,13 @@ When kbuild executes, the following steps are followed (roughly):
> In this example, extra-y is used to list object files that
> shall be built, but shall not be linked as part of built-in.a.
>
> + header-test-y
> +
> + header-test-y specifies headers (*.h) in the current directory that
> + should be compile tested to ensure they are self-contained,
> + i.e. compilable as standalone units. If CONFIG_HEADER_TEST is enabled,
> + this autogenerates dummy sources to include the headers, and builds them
> + as part of extra-y.
>
> --- 6.7 Commands useful for building a boot image
>
> diff --git a/init/Kconfig b/init/Kconfig
> index 4592bf7997c0..d91b157201b1 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -95,6 +95,15 @@ config COMPILE_TEST
> here. If you are a user/distributor, say N here to exclude useless
> drivers to be distributed.
>
> +config HEADER_TEST
> + bool "Compile test headers that should be standalone compilable"
> + help
> + Compile test headers listed in header-test-y target to ensure they are
> + self-contained, i.e. compilable as standalone units.
> +
> + If you are a developer or tester and want to ensure the requested
> + headers are self-contained, say Y here. Otherwise, choose N.
> +
> config LOCALVERSION
> string "Local version - append to kernel release"
> help
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index 76ca30cc4791..4d4bf698467a 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -291,6 +291,16 @@ quiet_cmd_cc_lst_c = MKLST $@
> $(obj)/%.lst: $(src)/%.c FORCE
> $(call if_changed_dep,cc_lst_c)
>
> +# Dummy C sources for header test (header-test-y target)
> +# ---------------------------------------------------------------------------
> +
> +quiet_cmd_header_test = HDRTEST $@
> + cmd_header_test = echo "\#include \"$(<F)\"" > $@
> +
> +# FIXME: would be nice to be able to limit this implicit rule to header-test-y
> +$(obj)/%.header_test.c: $(src)/%.h FORCE
> + $(call if_changed,header_test)
> +
> # Compile assembler sources (.S)
> # ---------------------------------------------------------------------------
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 8a1f64f17740..c2839de06485 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -66,6 +66,9 @@ extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> endif
>
> +# Test self-contained headers
> +extra-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.o,$(header-test-y))
> +
> # Add subdir path
>
> extra-y := $(addprefix $(obj)/,$(extra-y))
> --
> 2.20.1
>
Thanks, probably we should do this.
At least, this check will be useful
for uapi headers since the kernel does not
test the self-containedness of
exported headers, (then turned out be problematic
later in user-space).
I will take a little time to considier
how far we can extend the idea about
"headers should be self-contained".
Thank you.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-17 8:35 ` [RFC 1/3] " Chris Wilson
@ 2019-05-18 5:29 ` Masahiro Yamada
0 siblings, 0 replies; 16+ messages in thread
From: Masahiro Yamada @ 2019-05-18 5:29 UTC (permalink / raw)
To: Chris Wilson
Cc: Jani Nikula, Linux Kbuild mailing list, Linux Kernel Mailing List,
intel-gfx, Michal Marek
On Fri, May 17, 2019 at 5:35 PM Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
> Quoting Jani Nikula (2019-05-16 20:48:16)
> > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> > index 8a1f64f17740..c2839de06485 100644
> > --- a/scripts/Makefile.lib
> > +++ b/scripts/Makefile.lib
> > @@ -66,6 +66,9 @@ extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
> > extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
> > endif
> >
> > +# Test self-contained headers
> > +extra-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.o,$(header-test-y))
>
> This didn't get pulled into clean-files.
>
> clean-files-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.c,$(header-test-y))
> ?
>
> Not enough. Nor is clean-files-y +=...
The correct syntax is 'clean-files +='
instead of 'clean-files-y +='
If Kbuild supports this in the core Makefiles,
we can add "-o -name '*.header_test.c'"
to the top Makefile.
> And it should also be put into the global gitignore I think.
Documentation/dontdiff too.
> -Chris
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-18 5:16 ` Masahiro Yamada
@ 2019-05-20 9:20 ` Jani Nikula
2019-06-03 17:16 ` Masahiro Yamada
0 siblings, 1 reply; 16+ messages in thread
From: Jani Nikula @ 2019-05-20 9:20 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Michal Marek, intel-gfx, Linux Kernel Mailing List,
Linux Kbuild mailing list
On Sat, 18 May 2019, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> On Fri, May 17, 2019 at 4:48 AM Jani Nikula <jani.nikula@intel.com> wrote:
>>
>> Sometimes it's useful to be able to explicitly ensure certain headers
>> remain self-contained, i.e. that they are compilable as standalone
>> units, by including and/or forward declaring everything they depend on.
>>
>> Add special target header-test-y where individual Makefiles can add
>> headers to be tested if CONFIG_HEADER_TEST is enabled. This will
>> generate a dummy C file per header that gets built as part of extra-y.
>>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>> Cc: Michal Marek <michal.lkml@markovi.net>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> Documentation/kbuild/makefiles.txt | 7 +++++++
>> init/Kconfig | 9 +++++++++
>> scripts/Makefile.build | 10 ++++++++++
>> scripts/Makefile.lib | 3 +++
>> 4 files changed, 29 insertions(+)
>>
>> diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
>> index 03c065855eaf..73df58e5ea0c 100644
>> --- a/Documentation/kbuild/makefiles.txt
>> +++ b/Documentation/kbuild/makefiles.txt
>> @@ -1036,6 +1036,13 @@ When kbuild executes, the following steps are followed (roughly):
>> In this example, extra-y is used to list object files that
>> shall be built, but shall not be linked as part of built-in.a.
>>
>> + header-test-y
>> +
>> + header-test-y specifies headers (*.h) in the current directory that
>> + should be compile tested to ensure they are self-contained,
>> + i.e. compilable as standalone units. If CONFIG_HEADER_TEST is enabled,
>> + this autogenerates dummy sources to include the headers, and builds them
>> + as part of extra-y.
>>
>> --- 6.7 Commands useful for building a boot image
>>
>> diff --git a/init/Kconfig b/init/Kconfig
>> index 4592bf7997c0..d91b157201b1 100644
>> --- a/init/Kconfig
>> +++ b/init/Kconfig
>> @@ -95,6 +95,15 @@ config COMPILE_TEST
>> here. If you are a user/distributor, say N here to exclude useless
>> drivers to be distributed.
>>
>> +config HEADER_TEST
>> + bool "Compile test headers that should be standalone compilable"
>> + help
>> + Compile test headers listed in header-test-y target to ensure they are
>> + self-contained, i.e. compilable as standalone units.
>> +
>> + If you are a developer or tester and want to ensure the requested
>> + headers are self-contained, say Y here. Otherwise, choose N.
>> +
>> config LOCALVERSION
>> string "Local version - append to kernel release"
>> help
>> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
>> index 76ca30cc4791..4d4bf698467a 100644
>> --- a/scripts/Makefile.build
>> +++ b/scripts/Makefile.build
>> @@ -291,6 +291,16 @@ quiet_cmd_cc_lst_c = MKLST $@
>> $(obj)/%.lst: $(src)/%.c FORCE
>> $(call if_changed_dep,cc_lst_c)
>>
>> +# Dummy C sources for header test (header-test-y target)
>> +# ---------------------------------------------------------------------------
>> +
>> +quiet_cmd_header_test = HDRTEST $@
>> + cmd_header_test = echo "\#include \"$(<F)\"" > $@
>> +
>> +# FIXME: would be nice to be able to limit this implicit rule to header-test-y
>> +$(obj)/%.header_test.c: $(src)/%.h FORCE
>> + $(call if_changed,header_test)
>> +
>> # Compile assembler sources (.S)
>> # ---------------------------------------------------------------------------
>>
>> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
>> index 8a1f64f17740..c2839de06485 100644
>> --- a/scripts/Makefile.lib
>> +++ b/scripts/Makefile.lib
>> @@ -66,6 +66,9 @@ extra-y += $(patsubst %.dtb,%.dt.yaml, $(dtb-y))
>> extra-$(CONFIG_OF_ALL_DTBS) += $(patsubst %.dtb,%.dt.yaml, $(dtb-))
>> endif
>>
>> +# Test self-contained headers
>> +extra-$(CONFIG_HEADER_TEST) += $(patsubst %.h,%.header_test.o,$(header-test-y))
>> +
>> # Add subdir path
>>
>> extra-y := $(addprefix $(obj)/,$(extra-y))
>> --
>> 2.20.1
>>
>
>
> Thanks, probably we should do this.
>
> At least, this check will be useful
> for uapi headers since the kernel does not
> test the self-containedness of
> exported headers, (then turned out be problematic
> later in user-space).
>
> I will take a little time to considier
> how far we can extend the idea about
> "headers should be self-contained".
Thanks! Please let me know if/when you need further action from me, I
won't post new versions until then.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
` (6 preceding siblings ...)
2019-05-18 5:16 ` Masahiro Yamada
@ 2019-05-24 17:40 ` Sam Ravnborg
2019-06-03 17:05 ` Masahiro Yamada
2019-05-26 14:01 ` ✗ Fi.CI.BAT: failure for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained (rev2) Patchwork
8 siblings, 1 reply; 16+ messages in thread
From: Sam Ravnborg @ 2019-05-24 17:40 UTC (permalink / raw)
To: Jani Nikula
Cc: linux-kbuild, linux-kernel, intel-gfx, Chris Wilson,
Masahiro Yamada, Michal Marek
Hi Jani
> Sometimes it's useful to be able to explicitly ensure certain headers
> remain self-contained, i.e. that they are compilable as standalone
> units, by including and/or forward declaring everything they depend on.
>
> Add special target header-test-y where individual Makefiles can add
> headers to be tested if CONFIG_HEADER_TEST is enabled. This will
> generate a dummy C file per header that gets built as part of extra-y.
Very useful, thanks.
I have cooked up something ad-hoc a couple of times but having it as a
standard feature in the build system is much better.
The we can let some of our infrastructure pick up an issues
automatically.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Michal Marek <michal.lkml@markovi.net>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> Documentation/kbuild/makefiles.txt | 7 +++++++
> init/Kconfig | 9 +++++++++
> scripts/Makefile.build | 10 ++++++++++
> scripts/Makefile.lib | 3 +++
> 4 files changed, 29 insertions(+)
>
> diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
> index 03c065855eaf..73df58e5ea0c 100644
> --- a/Documentation/kbuild/makefiles.txt
> +++ b/Documentation/kbuild/makefiles.txt
> @@ -1036,6 +1036,13 @@ When kbuild executes, the following steps are followed (roughly):
> In this example, extra-y is used to list object files that
> shall be built, but shall not be linked as part of built-in.a.
>
> + header-test-y
> +
> + header-test-y specifies headers (*.h) in the current directory that
> + should be compile tested to ensure they are self-contained,
> + i.e. compilable as standalone units. If CONFIG_HEADER_TEST is enabled,
> + this autogenerates dummy sources to include the headers, and builds them
> + as part of extra-y.
Do we want to restrict this to current directory only?
Sometimes we could use this for headers in include/ but let it
trigger for the relevant subsystem.
So for example drivers/gpu/drm/Makefile will include the rules
for all headers in include/drm/*
The alternative would be Makefiles (of Kbuild files)
scattered in the directories with headers and then some
infrastructure to visit those.
Follow patch extend the header-test feature to work with
headers in include/
Example:
# Header files from this directory
header-test-y += drm_crtc_helper_internal.h
header-test-y += drm_crtc_internal.h
..
.
# Header files from include/drm
header-test-y += drm/amd_asic_type.h
header-test-y += drm/ati_pcigart.h
...
In the patch $* is used to get the "stem" from the pattern.
This is the filname of the header file without extension.
Sam
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 4d4bf698467a..ca132ab3a551 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -295,11 +295,10 @@ $(obj)/%.lst: $(src)/%.c FORCE
# ---------------------------------------------------------------------------
quiet_cmd_header_test = HDRTEST $@
- cmd_header_test = echo "\#include \"$(<F)\"" > $@
+ cmd_header_test = echo "\#include <$(2).h>" > $@
-# FIXME: would be nice to be able to limit this implicit rule to header-test-y
-$(obj)/%.header_test.c: $(src)/%.h FORCE
- $(call if_changed,header_test)
+$(obj)/%.header_test.c:
+ $(call cmd,header_test,$*)
# Compile assembler sources (.S)
# ---------------------------------------------------------------------------
^ permalink raw reply related [flat|nested] 16+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained (rev2)
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
` (7 preceding siblings ...)
2019-05-24 17:40 ` Sam Ravnborg
@ 2019-05-26 14:01 ` Patchwork
8 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2019-05-26 14:01 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: intel-gfx
== Series Details ==
Series: series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/60738/
State : failure
== Summary ==
Applying: kbuild: add support for ensuring headers are self-contained
Using index info to reconstruct a base tree...
M scripts/Makefile.build
Falling back to patching base and 3-way merge...
Auto-merging scripts/Makefile.build
CONFLICT (content): Merge conflict in scripts/Makefile.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 kbuild: add support for ensuring headers are self-contained
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-24 17:40 ` Sam Ravnborg
@ 2019-06-03 17:05 ` Masahiro Yamada
2019-06-03 17:33 ` Sam Ravnborg
0 siblings, 1 reply; 16+ messages in thread
From: Masahiro Yamada @ 2019-06-03 17:05 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Michal Marek, Linux Kbuild mailing list, Jani Nikula, intel-gfx,
Linux Kernel Mailing List
Hi Sam,
On Sat, May 25, 2019 at 2:40 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Hi Jani
>
> > Sometimes it's useful to be able to explicitly ensure certain headers
> > remain self-contained, i.e. that they are compilable as standalone
> > units, by including and/or forward declaring everything they depend on.
> >
> > Add special target header-test-y where individual Makefiles can add
> > headers to be tested if CONFIG_HEADER_TEST is enabled. This will
> > generate a dummy C file per header that gets built as part of extra-y.
>
> Very useful, thanks.
> I have cooked up something ad-hoc a couple of times but having it as a
> standard feature in the build system is much better.
> The we can let some of our infrastructure pick up an issues
> automatically.
>
> >
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> > Cc: Michal Marek <michal.lkml@markovi.net>
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > ---
> > Documentation/kbuild/makefiles.txt | 7 +++++++
> > init/Kconfig | 9 +++++++++
> > scripts/Makefile.build | 10 ++++++++++
> > scripts/Makefile.lib | 3 +++
> > 4 files changed, 29 insertions(+)
> >
> > diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
> > index 03c065855eaf..73df58e5ea0c 100644
> > --- a/Documentation/kbuild/makefiles.txt
> > +++ b/Documentation/kbuild/makefiles.txt
> > @@ -1036,6 +1036,13 @@ When kbuild executes, the following steps are followed (roughly):
> > In this example, extra-y is used to list object files that
> > shall be built, but shall not be linked as part of built-in.a.
> >
> > + header-test-y
> > +
> > + header-test-y specifies headers (*.h) in the current directory that
> > + should be compile tested to ensure they are self-contained,
> > + i.e. compilable as standalone units. If CONFIG_HEADER_TEST is enabled,
> > + this autogenerates dummy sources to include the headers, and builds them
> > + as part of extra-y.
> Do we want to restrict this to current directory only?
> Sometimes we could use this for headers in include/ but let it
> trigger for the relevant subsystem.
> So for example drivers/gpu/drm/Makefile will include the rules
> for all headers in include/drm/*
>
> The alternative would be Makefiles (of Kbuild files)
> scattered in the directories with headers and then some
> infrastructure to visit those.
>
> Follow patch extend the header-test feature to work with
> headers in include/
Following the obj-y pattern,
I want to make header-test-y relative to $(obj).
> Example:
> # Header files from this directory
> header-test-y += drm_crtc_helper_internal.h
> header-test-y += drm_crtc_internal.h
These are described in drivers/gpu/drm/Makefile.
> ..
> .
> # Header files from include/drm
> header-test-y += drm/amd_asic_type.h
> header-test-y += drm/ati_pcigart.h
These are described in $(srctree)/include/Makefile.
> ...
>
>
> In the patch $* is used to get the "stem" from the pattern.
> This is the filname of the header file without extension.
>
>
> Sam
>
>
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index 4d4bf698467a..ca132ab3a551 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -295,11 +295,10 @@ $(obj)/%.lst: $(src)/%.c FORCE
> # ---------------------------------------------------------------------------
>
> quiet_cmd_header_test = HDRTEST $@
> - cmd_header_test = echo "\#include \"$(<F)\"" > $@
> + cmd_header_test = echo "\#include <$(2).h>" > $@
>
> -# FIXME: would be nice to be able to limit this implicit rule to header-test-y
> -$(obj)/%.header_test.c: $(src)/%.h FORCE
> - $(call if_changed,header_test)
> +$(obj)/%.header_test.c:
> + $(call cmd,header_test,$*)
>
> # Compile assembler sources (.S)
> # ---------------------------------------------------------------------------
>
Agree, this is much better,
and it is what scripts/Makefile.asm-generic does.
But, you do not need to pass '$*' via the argument.
I prefer this:
quiet_cmd_header_test = HDRTEST $@
cmd_header_test = echo "\#include \"$*.h\"" > $@
$(obj)/%.header_test.c:
$(call cmd,header_test)
--
Best Regards
Masahiro Yamada
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-05-20 9:20 ` [Intel-gfx] " Jani Nikula
@ 2019-06-03 17:16 ` Masahiro Yamada
0 siblings, 0 replies; 16+ messages in thread
From: Masahiro Yamada @ 2019-06-03 17:16 UTC (permalink / raw)
To: Jani Nikula
Cc: Michal Marek, intel-gfx, Linux Kernel Mailing List,
Linux Kbuild mailing list
Hi Jani,
On Mon, May 20, 2019 at 6:16 PM Jani Nikula <jani.nikula@intel.com> wrote:
>
> >
> > I will take a little time to considier
> > how far we can extend the idea about
> > "headers should be self-contained".
>
> Thanks! Please let me know if/when you need further action from me, I
> won't post new versions until then.
Could you send v2 with the following changes ?
[1] Could you rename *.header_test.c to *.hdrtest.c ?
(I just thought .header_test.c was a bit too long.)
[2] %.hdrtest.c should not depend on the header
This will avoid unnecessary regeneration of *.hdrtest.c
quiet_cmd_header_test = HDRTEST $@
cmd_header_test = echo "\#include \"$*.h\"" > $@
$(obj)/%.hdrtest.c:
$(call cmd,header_test)
[3] Please add '*.hdrtest.c' to .gitignore, Documentation/dontdiff
[4] Please add '*.hdrtest.c' to 'make clean' (around line 1640 of top Makefile)
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-06-03 17:05 ` Masahiro Yamada
@ 2019-06-03 17:33 ` Sam Ravnborg
2019-06-04 0:20 ` Masahiro Yamada
0 siblings, 1 reply; 16+ messages in thread
From: Sam Ravnborg @ 2019-06-03 17:33 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Jani Nikula, Linux Kbuild mailing list, Linux Kernel Mailing List,
intel-gfx, Chris Wilson, Michal Marek
Hi Masahiro/Jani.
>
> Following the obj-y pattern,
> I want to make header-test-y relative to $(obj).
I also considered this and agree this is better.
Otherwise we end up with a spaghetti of dependencies across the tree.
What I made just fit the purpose I had that day,
which is no excuse for bad design.
> I prefer this:
>
> quiet_cmd_header_test = HDRTEST $@
> cmd_header_test = echo "\#include \"$*.h\"" > $@
>
> $(obj)/%.header_test.c:
> $(call cmd,header_test)
Even better - good.
We call it HDRTEST - so why not just go for that name:
hdrtest-y += headerfile.h
??
The current proposal with "header-test-y" hurts the eye a little with
two '-', and all other variables uses only one '-' as is today.
(generic-y, obj-y etc).
This is bikeshedding but is was itcing me a little.
Sam
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC 1/3] kbuild: add support for ensuring headers are self-contained
2019-06-03 17:33 ` Sam Ravnborg
@ 2019-06-04 0:20 ` Masahiro Yamada
0 siblings, 0 replies; 16+ messages in thread
From: Masahiro Yamada @ 2019-06-04 0:20 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Michal Marek, Linux Kbuild mailing list, Jani Nikula, intel-gfx,
Linux Kernel Mailing List
Hi Sam, Jani,
On Tue, Jun 4, 2019 at 2:33 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> Hi Masahiro/Jani.
>
> >
> > Following the obj-y pattern,
> > I want to make header-test-y relative to $(obj).
>
> I also considered this and agree this is better.
>
> Otherwise we end up with a spaghetti of dependencies across the tree.
>
> What I made just fit the purpose I had that day,
> which is no excuse for bad design.
>
> > I prefer this:
> >
> > quiet_cmd_header_test = HDRTEST $@
> > cmd_header_test = echo "\#include \"$*.h\"" > $@
> >
> > $(obj)/%.header_test.c:
> > $(call cmd,header_test)
>
> Even better - good.
>
> We call it HDRTEST - so why not just go for that name:
>
> hdrtest-y += headerfile.h
>
> ??
>
> The current proposal with "header-test-y" hurts the eye a little with
> two '-', and all other variables uses only one '-' as is today.
> (generic-y, obj-y etc).
>
> This is bikeshedding but is was itcing me a little.
I do not have a strong opinion.
I leave it to Jani. Either is fine with me.
There are variables that contain two '-'.
'no-clean-files', 'subdir-ccflags-y', etc.
--
Best Regards
Masahiro Yamada
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2019-06-04 0:21 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-16 19:48 [RFC 1/3] kbuild: add support for ensuring headers are self-contained Jani Nikula
2019-05-16 19:48 ` [RFC 2/3] drm/i915: ensure headers remain self-contained Jani Nikula
2019-05-16 19:48 ` [RFC 3/3] DO NOT MERGE: drm/i915: add failing header to header-test-y Jani Nikula
2019-05-16 20:12 ` ✗ Fi.CI.SPARSE: warning for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained Patchwork
2019-05-16 20:31 ` ✓ Fi.CI.BAT: success " Patchwork
2019-05-17 3:54 ` ✓ Fi.CI.IGT: " Patchwork
2019-05-17 8:35 ` [RFC 1/3] " Chris Wilson
2019-05-18 5:29 ` Masahiro Yamada
2019-05-18 5:16 ` Masahiro Yamada
2019-05-20 9:20 ` [Intel-gfx] " Jani Nikula
2019-06-03 17:16 ` Masahiro Yamada
2019-05-24 17:40 ` Sam Ravnborg
2019-06-03 17:05 ` Masahiro Yamada
2019-06-03 17:33 ` Sam Ravnborg
2019-06-04 0:20 ` Masahiro Yamada
2019-05-26 14:01 ` ✗ Fi.CI.BAT: failure for series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained (rev2) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).