drm/i915: add Makefile magic for testing headers are self-contained
Subsystems (2)
PATCH 1/1 drm/i915: add Makefile magic for testing headers are self-contained
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header") 3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h") 8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
--- drivers/gpu/drm/i915/Makefile | 16 +++++--------- drivers/gpu/drm/i915/Makefile.header-test | 21 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------- .../test_i915_gem_context_types_standalone.c | 7 ------- .../test_i915_priolist_types_standalone.c | 7 ------- .../test_i915_scheduler_types_standalone.c | 7 ------- .../test_i915_timeline_types_standalone.c | 7 ------- .../test_intel_context_types_standalone.c | 7 ------- .../i915/test_intel_engine_types_standalone.c | 7 ------- .../test_intel_workarounds_types_standalone.c | 7 ------- 10 files changed, 26 insertions(+), 67 deletions(-) create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
drivers/gpu/drm/i915/Makefile +5 -11
@@ -57,17 +57,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \
@@ -218,3 +207,8 @@ i915-y += intel_lpe_audio.o obj-$(CONFIG_DRM_I915) += i915.o obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o + +# Extra header tests +ifeq ($(CONFIG_DRM_I915_WERROR),y) +include $(src)/Makefile.header-test +endif
drivers/gpu/drm/i915/Makefile.header-test new file +21 -0
@@ -0,0 +1,21 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +# To test <base>.h add header_test_<base>.o here +extra-y += \ + header_test_i915_active_types.o \ + header_test_i915_gem_context_types.o \ + header_test_i915_priolist_types.o \ + header_test_i915_scheduler_types.o \ + header_test_i915_timeline_types.o \ + header_test_intel_context_types.o \ + header_test_intel_engine_types.o \ + header_test_intel_workarounds_types.o
drivers/gpu/drm/i915/test_i915_active_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_active_types.h"
drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_gem_context_types.h"
drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_priolist_types.h"
drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_scheduler_types.h"
drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_timeline_types.h"
drivers/gpu/drm/i915/test_intel_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_context_types.h"
drivers/gpu/drm/i915/test_intel_engine_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_engine_types.h"
drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_workarounds_types.h"
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2019-04-03 11:06:36)
Quoted 7 lines
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")
Quoted 5 lines
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
I knew it would work :-p
Quoted 48 lines
Cc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/Makefile | 16 +++++--------- drivers/gpu/drm/i915/Makefile.header-test | 21 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------- .../test_i915_gem_context_types_standalone.c | 7 ------- .../test_i915_priolist_types_standalone.c | 7 ------- .../test_i915_scheduler_types_standalone.c | 7 ------- .../test_i915_timeline_types_standalone.c | 7 ------- .../test_intel_context_types_standalone.c | 7 ------- .../i915/test_intel_engine_types_standalone.c | 7 ------- .../test_intel_workarounds_types_standalone.c | 7 ------- 10 files changed, 26 insertions(+), 67 deletions(-) create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.cdrivers/gpu/drm/i915/Makefile +0
-11@@ -57,17 +57,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \
drivers/gpu/drm/i915/Makefile i915-y += intel_lpe_audio.o · line 214
Quoted 8 lines
drivers/gpu/drm/i915/Makefile +5
-0@@ -218,3 +207,8 @@ i915-y += intel_lpe_audio.o obj-$(CONFIG_DRM_I915) += i915.o obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o + +# Extra header tests +ifeq ($(CONFIG_DRM_I915_WERROR),y) +include $(src)/Makefile.header-test +endif
Can we get the headers tested first?
Fixing the standalone tests is a lot easier than traversing the dependency chain of includes in a regular compile file.
Quoted 17 lines
drivers/gpu/drm/i915/Makefile.header-test new file +11
-0@@ -0,0 +1,21 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) +
drivers/gpu/drm/i915/Makefile.header-test line 21
Quoted 10 lines
drivers/gpu/drm/i915/Makefile.header-test new file +10
-0+# To test <base>.h add header_test_<base>.o here +extra-y += \ + header_test_i915_active_types.o \ + header_test_i915_gem_context_types.o \ + header_test_i915_priolist_types.o \ + header_test_i915_scheduler_types.o \ + header_test_i915_timeline_types.o \ + header_test_intel_context_types.o \ + header_test_intel_engine_types.o \ + header_test_intel_workarounds_types.o
Should there be a way to add the autogenerated files to make clean? -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Chris Wilson (2019-04-03 11:10:31)
Quoted 99 lines
Quoting Jani Nikula (2019-04-03 11:06:36)
Quoted 7 lines
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")Quoted 5 lines
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
I knew it would work :-p
Quoted 48 lines
Cc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/Makefile | 16 +++++--------- drivers/gpu/drm/i915/Makefile.header-test | 21 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------- .../test_i915_gem_context_types_standalone.c | 7 ------- .../test_i915_priolist_types_standalone.c | 7 ------- .../test_i915_scheduler_types_standalone.c | 7 ------- .../test_i915_timeline_types_standalone.c | 7 ------- .../test_intel_context_types_standalone.c | 7 ------- .../i915/test_intel_engine_types_standalone.c | 7 ------- .../test_intel_workarounds_types_standalone.c | 7 ------- 10 files changed, 26 insertions(+), 67 deletions(-) create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.cdrivers/gpu/drm/i915/Makefile +0
-11@@ -57,17 +57,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \drivers/gpu/drm/i915/Makefile i915-y += intel_lpe_audio.o · line 214
Quoted 8 lines
drivers/gpu/drm/i915/Makefile +5
-0@@ -218,3 +207,8 @@ i915-y += intel_lpe_audio.o obj-$(CONFIG_DRM_I915) += i915.o obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o + +# Extra header tests +ifeq ($(CONFIG_DRM_I915_WERROR),y) +include $(src)/Makefile.header-test +endifCan we get the headers tested first?
Fixing the standalone tests is a lot easier than traversing the dependency chain of includes in a regular compile file.
Quoted 21 lines
drivers/gpu/drm/i915/Makefile.header-test new file +15
-0@@ -0,0 +1,21 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +# To test <base>.h add header_test_<base>.o here +extra-y += \ + header_test_i915_active_types.o \ + header_test_i915_gem_context_types.o \
Quoted 8 lines
drivers/gpu/drm/i915/Makefile.header-test line 21
Quoted 6 lines
drivers/gpu/drm/i915/Makefile.header-test new file +6
-0+ header_test_i915_priolist_types.o \ + header_test_i915_scheduler_types.o \ + header_test_i915_timeline_types.o \ + header_test_intel_context_types.o \ + header_test_intel_engine_types.o \ + header_test_intel_workarounds_types.oShould there be a way to add the autogenerated files to make clean?
clean-files += header_test_*.c
No idea if that works.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2019-04-03 11:06:36)
Quoted 7 lines
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")
Quoted 5 lines
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
Also wants
i915/.gitignore: header_test_*.c
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: add Makefile magic for testing headers are self-contained
In reply to Jani NikulaFrom: Jani Nikula <[email protected]>
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header") 3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h") 8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
---
Use patsubst liberally to reduce the chore of adding more headers. make clean doesn't quite work yet, although it seems to be the right style.
--- drivers/gpu/drm/i915/.gitignore | 1 + drivers/gpu/drm/i915/Makefile | 16 ++++--------- drivers/gpu/drm/i915/Makefile.header-test | 24 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------ .../test_i915_gem_context_types_standalone.c | 7 ------ .../test_i915_priolist_types_standalone.c | 7 ------ .../test_i915_scheduler_types_standalone.c | 7 ------ .../test_i915_timeline_types_standalone.c | 7 ------ .../test_intel_context_types_standalone.c | 7 ------ .../i915/test_intel_engine_types_standalone.c | 7 ------ .../test_intel_workarounds_types_standalone.c | 7 ------ 11 files changed, 30 insertions(+), 67 deletions(-) create mode 100644 drivers/gpu/drm/i915/.gitignore create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
drivers/gpu/drm/i915/.gitignore new file +1 -0
@@ -0,0 +1 @@ +header_test_*.c
drivers/gpu/drm/i915/Makefile +5 -11
@@ -32,6 +32,11 @@ CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += \ $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA) +# Extra header tests +ifeq ($(CONFIG_DRM_I915_WERROR),y) +include $(src)/Makefile.header-test +endif + # Please keep these build lists sorted! # core driver code
@@ -57,17 +62,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \
drivers/gpu/drm/i915/Makefile.header-test new file +24 -0
@@ -0,0 +1,24 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units +header_test := \ + i915_active_types.h \ + i915_gem_context_types.h \ + i915_priolist_types.h \ + i915_scheduler_types.h \ + i915_timeline_types.h \ + intel_context_types.h \ + intel_engine_types.h \ + intel_workarounds_types.h + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +# To test <base>.h add header_test_<base>.o here +extra-y += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h))) + +clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
drivers/gpu/drm/i915/test_i915_active_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_active_types.h"
drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_gem_context_types.h"
drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_priolist_types.h"
drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_scheduler_types.h"
drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_timeline_types.h"
drivers/gpu/drm/i915/test_intel_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_context_types.h"
drivers/gpu/drm/i915/test_intel_engine_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_engine_types.h"
drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_workarounds_types.h"
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Chris Wilson
From: Jani Nikula <[email protected]>
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
Quoted 7 lines
Cc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Jani Nikula <[email protected]>---
Use patsubst liberally to reduce the chore of adding more headers. make clean doesn't quite work yet, although it seems to be the right style.
I don't know what gives, I'm unable to make it work. I've been trying with O= builds.
Quoted 36 lines
--- drivers/gpu/drm/i915/.gitignore | 1 + drivers/gpu/drm/i915/Makefile | 16 ++++--------- drivers/gpu/drm/i915/Makefile.header-test | 24 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------ .../test_i915_gem_context_types_standalone.c | 7 ------ .../test_i915_priolist_types_standalone.c | 7 ------ .../test_i915_scheduler_types_standalone.c | 7 ------ .../test_i915_timeline_types_standalone.c | 7 ------ .../test_intel_context_types_standalone.c | 7 ------ .../i915/test_intel_engine_types_standalone.c | 7 ------ .../test_intel_workarounds_types_standalone.c | 7 ------ 11 files changed, 30 insertions(+), 67 deletions(-) create mode 100644 drivers/gpu/drm/i915/.gitignore create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.cdrivers/gpu/drm/i915/.gitignore new file +1
-0@@ -0,0 +1 @@ +header_test_*.cdrivers/gpu/drm/i915/Makefile +0
-0
drivers/gpu/drm/i915/Makefile CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) · line 39
Quoted 8 lines
drivers/gpu/drm/i915/Makefile +5
-0@@ -32,6 +32,11 @@ CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += \ $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA) +# Extra header tests +ifeq ($(CONFIG_DRM_I915_WERROR),y) +include $(src)/Makefile.header-test +endif +
Agreed on adding this first, though you'll need to omit -j to actually make it happen first.
Quoted 38 lines
drivers/gpu/drm/i915/Makefile +0
-11# Please keep these build lists sorted! # core driver code@@ -57,17 +62,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \drivers/gpu/drm/i915/Makefile.header-test new file +11
-0@@ -0,0 +1,24 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units +header_test := \ + i915_active_types.h \ + i915_gem_context_types.h \ + i915_priolist_types.h \ + i915_scheduler_types.h \ + i915_timeline_types.h \ + intel_context_types.h \
drivers/gpu/drm/i915/Makefile.header-test line 21
Quoted 10 lines
drivers/gpu/drm/i915/Makefile.header-test new file +10
-0+ intel_engine_types.h \ + intel_workarounds_types.h + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +# To test <base>.h add header_test_<base>.o here
The comment just became stale.
drivers/gpu/drm/i915/Makefile.header-test line 22
Quoted 1 line
drivers/gpu/drm/i915/Makefile.header-test new file +1
-0+extra-y += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
Nice.
For making subdirs work, I think the rules should be separate from declaring the headers to test, i.e. each subdir needs to have a Makefile that's included using "obj-y += subdir/" in the parent instead of "include $(src)/subdir/Makefile". Ideally, the rules would be in the global Makefile.build... using something like "headertest-y". But let's not get ahead of ourselves.
Quoted 106 lines
drivers/gpu/drm/i915/Makefile.header-test new file +2
-0+ +clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))drivers/gpu/drm/i915/test_i915_active_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_active_types.h" drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_gem_context_types.h" drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_priolist_types.h" drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_scheduler_types.h" drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_timeline_types.h" drivers/gpu/drm/i915/test_intel_context_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_context_types.h" drivers/gpu/drm/i915/test_intel_engine_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_engine_types.h" drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c deleted +0
-7@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_workarounds_types.h"
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2019-04-03 11:06:36)
Quoted 7 lines
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")
Quoted 5 lines
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
The next question is to how to handle subdirs?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: add Makefile magic for testing headers are self-contained (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/58938/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
fc28b7a305b3 drm/i915: add Makefile magic for testing headers are self-contained
-:10: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#10:
39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")' #10:39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")
-:11: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h")' #11:3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h")
-:12: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")' #12:8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")
-:25: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #25:
new file mode 100644
total: 3 errors, 2 warnings, 0 checks, 53 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915: add Makefile magic for testing headers are self-contained (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/58938/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: add Makefile magic for testing headers are self-contained -./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0) -./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0) -./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0) +
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: add Makefile magic for testing headers are self-contained (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/58938/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5862 -> Patchwork_12673
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58938/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12673 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-compute0:
- fi-icl-y: NOTRUN -> SKIP [fdo#109315] +17
* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-icl-u3: NOTRUN -> SKIP [fdo#109315] +17
* igt@gem_exec_basic@basic-bsd2:
- fi-icl-y: NOTRUN -> SKIP [fdo#109276] +7
* igt@gem_exec_basic@gtt-bsd1:
- fi-icl-u3: NOTRUN -> SKIP [fdo#109276] +7
* igt@gem_exec_parse@basic-rejected:
- fi-icl-u3: NOTRUN -> SKIP [fdo#109289] +1
- fi-icl-y: NOTRUN -> SKIP [fdo#109289] +1
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: PASS -> FAIL [fdo#108511]
* igt@i915_selftest@live_contexts:
- fi-icl-u3: NOTRUN -> DMESG-FAIL [fdo#108569]
- fi-bdw-gvtdvm: PASS -> DMESG-FAIL [fdo#110235 ]
- fi-icl-y: NOTRUN -> DMESG-FAIL [fdo#108569] * igt@kms_chamelium@dp-crc-fast:
- fi-icl-y: NOTRUN -> SKIP [fdo#109284] +8
* igt@kms_chamelium@hdmi-edid-read:
- fi-icl-u3: NOTRUN -> SKIP [fdo#109284] +8
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-y: NOTRUN -> SKIP [fdo#109285] +3
* igt@kms_force_connector_basic@prune-stale-modes:
- fi-icl-u3: NOTRUN -> SKIP [fdo#109285] +3
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u3: NOTRUN -> FAIL [fdo#103167]
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
* igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]
* igt@kms_psr@primary_mmap_gtt:
- fi-icl-y: NOTRUN -> SKIP [fdo#110189] +3
- fi-blb-e6850: NOTRUN -> SKIP [fdo#109271] +27
* igt@prime_vgem@basic-fence-flip:
- fi-icl-y: NOTRUN -> SKIP [fdo#109294]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-icl-y: INCOMPLETE [fdo#110246] -> PASS
* igt@gem_basic@bad-close:
- fi-icl-u3: INCOMPLETE -> PASS
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: FAIL [fdo#103167] -> PASS
* igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109294]: https://bugs.freedesktop.org/show_bug.cgi?id=109294
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
[fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
Participating hosts (45 -> 39)
------------------------------
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5862 -> Patchwork_12673
CI_DRM_5862: c97de10a1caf7b856efe273c901fceea3fc78367 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4923: 6285eec4f3b8f21833d9d2d852883569d6551822 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12673: fc28b7a305b35b247fb27075d9afc2c0e1d9f329 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fc28b7a305b3 drm/i915: add Makefile magic for testing headers are self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12673/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915: add Makefile magic for testing headers are self-contained
In reply to Jani NikulaThe below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header") 3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h") 8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
v2 by Chris:
- Use patsubst
- Add .gitignore
- Add clean-files for generated dummy sources
v3 by Jani:
- Fix make clean
- Add the tests to i915-y instead of extra-y
--- drivers/gpu/drm/i915/.gitignore | 1 + drivers/gpu/drm/i915/Makefile | 16 ++++--------- drivers/gpu/drm/i915/Makefile.header-test | 23 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------ .../test_i915_gem_context_types_standalone.c | 7 ------ .../test_i915_priolist_types_standalone.c | 7 ------ .../test_i915_scheduler_types_standalone.c | 7 ------ .../test_i915_timeline_types_standalone.c | 7 ------ .../test_intel_context_types_standalone.c | 7 ------ .../i915/test_intel_engine_types_standalone.c | 7 ------ .../test_intel_workarounds_types_standalone.c | 7 ------ 11 files changed, 28 insertions(+), 68 deletions(-) create mode 100644 drivers/gpu/drm/i915/.gitignore create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
drivers/gpu/drm/i915/.gitignore new file +1 -0
@@ -0,0 +1 @@ +header_test_*.c
drivers/gpu/drm/i915/Makefile +4 -12
@@ -32,10 +32,13 @@ CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += \ $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA) +# Extra header tests +include $(src)/Makefile.header-test + # Please keep these build lists sorted! # core driver code -i915-y := i915_drv.o \ +i915-y += i915_drv.o \ i915_irq.o \ i915_memcpy.o \ i915_mm.o \
@@ -57,17 +60,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \
drivers/gpu/drm/i915/Makefile.header-test new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units +header_test := \ + i915_active_types.h \ + i915_gem_context_types.h \ + i915_priolist_types.h \ + i915_scheduler_types.h \ + i915_timeline_types.h \ + intel_context_types.h \ + intel_engine_types.h \ + intel_workarounds_types.h + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h))) + +clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
drivers/gpu/drm/i915/test_i915_active_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_active_types.h"
drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_gem_context_types.h"
drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_priolist_types.h"
drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_scheduler_types.h"
drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_timeline_types.h"
drivers/gpu/drm/i915/test_intel_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_context_types.h"
drivers/gpu/drm/i915/test_intel_engine_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_engine_types.h"
drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_workarounds_types.h"
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2019-04-03 14:32:36)
Quoted 104 lines
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
v2 by Chris:
- Use patsubst
- Add .gitignore
- Add clean-files for generated dummy sourcesv3 by Jani:
- Fix make clean
- Add the tests to i915-y instead of extra-yCc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/.gitignore | 1 + drivers/gpu/drm/i915/Makefile | 16 ++++--------- drivers/gpu/drm/i915/Makefile.header-test | 23 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------ .../test_i915_gem_context_types_standalone.c | 7 ------ .../test_i915_priolist_types_standalone.c | 7 ------ .../test_i915_scheduler_types_standalone.c | 7 ------ .../test_i915_timeline_types_standalone.c | 7 ------ .../test_intel_context_types_standalone.c | 7 ------ .../i915/test_intel_engine_types_standalone.c | 7 ------ .../test_intel_workarounds_types_standalone.c | 7 ------ 11 files changed, 28 insertions(+), 68 deletions(-) create mode 100644 drivers/gpu/drm/i915/.gitignore create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.cdrivers/gpu/drm/i915/.gitignore new file +1
-0@@ -0,0 +1 @@ +header_test_*.cdrivers/gpu/drm/i915/Makefile +4
-12@@ -32,10 +32,13 @@ CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += \ $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA) +# Extra header tests +include $(src)/Makefile.header-test + # Please keep these build lists sorted! # core driver code -i915-y := i915_drv.o \ +i915-y += i915_drv.o \ i915_irq.o \ i915_memcpy.o \ i915_mm.o \@@ -57,17 +60,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \drivers/gpu/drm/i915/Makefile.header-test new file +5
-0@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units +header_test := \
drivers/gpu/drm/i915/Makefile.header-test line 15
Quoted 10 lines
drivers/gpu/drm/i915/Makefile.header-test new file +10
-0+ i915_active_types.h \ + i915_gem_context_types.h \ + i915_priolist_types.h \ + i915_scheduler_types.h \ + i915_timeline_types.h \ + intel_context_types.h \ + intel_engine_types.h \ + intel_workarounds_types.h + +quiet_cmd_header_test = HDRTEST $@
Did you look at the output alignment? v1 needed a bit of a tweak to look good here.
drivers/gpu/drm/i915/Makefile.header-test line 23
Quoted 8 lines
drivers/gpu/drm/i915/Makefile.header-test new file +8
-0+ cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h))) + +clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
Magic. Pure magic. Much thanks.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 110 lines · Chris Wilson
Quoting Jani Nikula (2019-04-03 14:32:36)
Quoted 109 lines
The below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4("drm/i915: Split structintel_contextdefinition to its own header")3a891a626794("drm/i915: Moveintel_engine_mask_taround for use byi915_request_types.h")8b74594aa455("drm/i915: Split outi915_priolist_typesinto its own header")The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
v2 by Chris:
- Use patsubst
- Add .gitignore
- Add clean-files for generated dummy sourcesv3 by Jani:
- Fix make clean
- Add the tests to i915-y instead of extra-yCc Chris Wilson <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/.gitignore | 1 + drivers/gpu/drm/i915/Makefile | 16 ++++--------- drivers/gpu/drm/i915/Makefile.header-test | 23 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------ .../test_i915_gem_context_types_standalone.c | 7 ------ .../test_i915_priolist_types_standalone.c | 7 ------ .../test_i915_scheduler_types_standalone.c | 7 ------ .../test_i915_timeline_types_standalone.c | 7 ------ .../test_intel_context_types_standalone.c | 7 ------ .../i915/test_intel_engine_types_standalone.c | 7 ------ .../test_intel_workarounds_types_standalone.c | 7 ------ 11 files changed, 28 insertions(+), 68 deletions(-) create mode 100644 drivers/gpu/drm/i915/.gitignore create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.cdrivers/gpu/drm/i915/.gitignore new file +1
-0@@ -0,0 +1 @@ +header_test_*.cdrivers/gpu/drm/i915/Makefile +4
-12@@ -32,10 +32,13 @@ CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += \ $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA) +# Extra header tests +include $(src)/Makefile.header-test + # Please keep these build lists sorted! # core driver code -i915-y := i915_drv.o \ +i915-y += i915_drv.o \ i915_irq.o \ i915_memcpy.o \ i915_mm.o \@@ -57,17 +60,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \drivers/gpu/drm/i915/Makefile.header-test new file +10
-0@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units +header_test := \ + i915_active_types.h \ + i915_gem_context_types.h \ + i915_priolist_types.h \ + i915_scheduler_types.h \ + i915_timeline_types.h \
Quoted 8 lines
drivers/gpu/drm/i915/Makefile.header-test line 15
Quoted 5 lines
drivers/gpu/drm/i915/Makefile.header-test new file +5
-0+ intel_context_types.h \ + intel_engine_types.h \ + intel_workarounds_types.h + +quiet_cmd_header_test = HDRTEST $@Did you look at the output alignment? v1 needed a bit of a tweak to look good here.
Argh. I didn't actually *look* at it. v4 on its way.
Quoted 12 lines
drivers/gpu/drm/i915/Makefile.header-test line 23
Quoted 9 lines
drivers/gpu/drm/i915/Makefile.header-test new file +8
-0+ cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h))) + +clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))Magic. Pure magic. Much thanks.
Quoted 2 lines
Signed-off-by Chris Wilson <[email protected]> #v2 if you insistReviewed-by Chris Wilson <[email protected]>
Thanks. Now off to making more headers self-contained!
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/1 drm/i915: add Makefile magic for testing headers are self-contained
In reply to Jani NikulaThe below commits added dummy files to test that certain headers are self-contained, i.e. compilable as standalone units:
39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header") 3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h") 8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")
The idea is fine, but the implementation is a bit tedious and inflexible, and does not really scale well.
Implement the same in make using autogenerated dummy sources to include the headers.
v2 by Chris:
- Use patsubst
- Add .gitignore
- Add clean-files for generated dummy sources
v3 by Jani:
- Fix make clean
- Add the tests to i915-y instead of extra-y
v4 by Jani:
- quiet_cmd whitespace fix
--- drivers/gpu/drm/i915/.gitignore | 1 + drivers/gpu/drm/i915/Makefile | 16 ++++--------- drivers/gpu/drm/i915/Makefile.header-test | 23 +++++++++++++++++++ .../i915/test_i915_active_types_standalone.c | 7 ------ .../test_i915_gem_context_types_standalone.c | 7 ------ .../test_i915_priolist_types_standalone.c | 7 ------ .../test_i915_scheduler_types_standalone.c | 7 ------ .../test_i915_timeline_types_standalone.c | 7 ------ .../test_intel_context_types_standalone.c | 7 ------ .../i915/test_intel_engine_types_standalone.c | 7 ------ .../test_intel_workarounds_types_standalone.c | 7 ------ 11 files changed, 28 insertions(+), 68 deletions(-) create mode 100644 drivers/gpu/drm/i915/.gitignore create mode 100644 drivers/gpu/drm/i915/Makefile.header-test delete mode 100644 drivers/gpu/drm/i915/test_i915_active_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_context_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_engine_types_standalone.c delete mode 100644 drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c
drivers/gpu/drm/i915/.gitignore new file +1 -0
@@ -0,0 +1 @@ +header_test_*.c
drivers/gpu/drm/i915/Makefile +4 -12
@@ -32,10 +32,13 @@ CFLAGS_intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += \ $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA) +# Extra header tests +include $(src)/Makefile.header-test + # Please keep these build lists sorted! # core driver code -i915-y := i915_drv.o \ +i915-y += i915_drv.o \ i915_irq.o \ i915_memcpy.o \ i915_mm.o \
@@ -57,17 +60,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o -# Test the headers are compilable as standalone units -i915-$(CONFIG_DRM_I915_WERROR) += \ - test_i915_active_types_standalone.o \ - test_i915_gem_context_types_standalone.o \ - test_i915_priolist_types_standalone.o \ - test_i915_scheduler_types_standalone.o \ - test_i915_timeline_types_standalone.o \ - test_intel_context_types_standalone.o \ - test_intel_engine_types_standalone.o \ - test_intel_workarounds_types_standalone.o - # GEM code i915-y += \ i915_active.o \
drivers/gpu/drm/i915/Makefile.header-test new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Copyright © 2019 Intel Corporation + +# Test the headers are compilable as standalone units +header_test := \ + i915_active_types.h \ + i915_gem_context_types.h \ + i915_priolist_types.h \ + i915_scheduler_types.h \ + i915_timeline_types.h \ + intel_context_types.h \ + intel_engine_types.h \ + intel_workarounds_types.h + +quiet_cmd_header_test = HDRTEST $@ + cmd_header_test = echo "\#include \"$(<F)\"" > $@ + +header_test_%.c: %.h + $(call cmd,header_test) + +i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h))) + +clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
drivers/gpu/drm/i915/test_i915_active_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_active_types.h"
drivers/gpu/drm/i915/test_i915_gem_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_gem_context_types.h"
drivers/gpu/drm/i915/test_i915_priolist_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_priolist_types.h"
drivers/gpu/drm/i915/test_i915_scheduler_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_scheduler_types.h"
drivers/gpu/drm/i915/test_i915_timeline_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "i915_timeline_types.h"
drivers/gpu/drm/i915/test_intel_context_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_context_types.h"
drivers/gpu/drm/i915/test_intel_engine_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_engine_types.h"
drivers/gpu/drm/i915/test_intel_workarounds_types_standalone.c deleted +0 -7
@@ -1,7 +0,0 @@ -/* -* SPDX-License-Identifier: MIT -* -* Copyright © 2019 Intel Corporation -*/ - -#include "intel_workarounds_types.h"
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: add Makefile magic for testing headers are self-contained (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev4)
URL : https://patchwork.freedesktop.org/series/58938/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
5f226a4e31cd drm/i915: add Makefile magic for testing headers are self-contained
-:10: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#10:
39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")-:10: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")' #10:39e2f501c1b4 ("drm/i915: Split struct intel_context definition to its own header")
-:11: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h")' #11:3a891a626794 ("drm/i915: Move intel_engine_mask_t around for use by i915_request_types.h")
-:12: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")' #12:8b74594aa455 ("drm/i915: Split out i915_priolist_types into its own header")
-:38: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #38:
new file mode 100644
total: 3 errors, 2 warnings, 0 checks, 55 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915: add Makefile magic for testing headers are self-contained (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev4)
URL : https://patchwork.freedesktop.org/series/58938/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: add Makefile magic for testing headers are self-contained -./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0) -./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0) -./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0) +
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: add Makefile magic for testing headers are self-contained (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev4)
URL : https://patchwork.freedesktop.org/series/58938/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5863 -> Patchwork_12674
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58938/revisions/4/mbox/
Known issues
------------
Here are the changes found in Patchwork_12674 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_store@basic-bsd1:
- fi-kbl-r: NOTRUN -> SKIP [fdo#109271] +41
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] +1
#### Possible fixes ####
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-b:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#107362] -> PASS
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
Participating hosts (47 -> 39)
------------------------------
Additional (1): fi-kbl-r
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5863 -> Patchwork_12674
CI_DRM_5863: d2c849411d8ae6de9c718b9c0cd1e00da7f0f121 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4924: bcf2f21996b2ee5c6177f5412046690ff8017772 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12674: 5f226a4e31cdc3bbb9c26c1d6d58e6a8d582b7e9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5f226a4e31cd drm/i915: add Makefile magic for testing headers are self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12674/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm/i915: add Makefile magic for testing headers are self-contained (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: add Makefile magic for testing headers are self-contained (rev4)
URL : https://patchwork.freedesktop.org/series/58938/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5863_full -> Patchwork_12674_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12674_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_12674_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12674_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_eio@reset-stress:
- shard-skl: PASS -> DMESG-WARN
Known issues
------------
Here are the changes found in Patchwork_12674_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ppgtt@blt-vs-render-ctxn:
- shard-iclb: PASS -> INCOMPLETE [fdo#109801]
* igt@gem_userptr_blits@process-exit-gtt:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +44
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#110222] +1
* igt@kms_busy@extended-pageflip-hang-oldfb-render-f:
- shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-apl: PASS -> DMESG-WARN [fdo#110222]
* igt@kms_chamelium@hdmi-crc-fast:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +83
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_legacy@cursor-vs-flip-atomic:
- shard-iclb: PASS -> FAIL [fdo#103355] +1
* igt@kms_flip@2x-modeset-vs-vblank-race:
- shard-glk: PASS -> FAIL [fdo#103060]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-iclb: PASS -> FAIL [fdo#105363]
- shard-skl: PASS -> FAIL [fdo#105363]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: PASS -> FAIL [fdo#103167] +4
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt:
- shard-skl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-iclb: PASS -> FAIL [fdo#109247] +18
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-mmap-gtt:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +1
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-f:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +10
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-skl: NOTRUN -> INCOMPLETE [fdo#104108]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: PASS -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815]
* igt@kms_psr@primary_mmap_gtt:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215]
#### Possible fixes ####
* igt@gem_tiled_pread_pwrite:
- shard-iclb: TIMEOUT [fdo#109673] -> PASS
* igt@i915_pm_rpm@system-suspend-devices:
- shard-skl: INCOMPLETE [fdo#107807] -> PASS
* igt@kms_cursor_crc@cursor-128x42-offscreen:
- shard-skl: FAIL [fdo#103232] -> PASS
* igt@kms_cursor_edge_walk@pipe-a-128x128-left-edge:
- shard-snb: SKIP [fdo#109271] / [fdo#109278] -> PASS
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-glk: FAIL [fdo#104873] -> PASS
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: FAIL [fdo#102887] / [fdo#105363] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-iclb: FAIL [fdo#103167] -> PASS +14
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-wc:
- shard-iclb: FAIL [fdo#109247] -> PASS +21
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-pwrite:
- shard-iclb: FAIL [fdo#105682] / [fdo#109247] -> PASS +3
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: FAIL [fdo#108145] -> PASS
* igt@kms_psr2_su@page_flip:
- shard-iclb: SKIP [fdo#109642] -> PASS
* igt@kms_psr@cursor_mmap_gtt:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS +4
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: SKIP [fdo#109441] -> PASS +1
* igt@kms_setmode@basic:
- shard-kbl: FAIL [fdo#99912] -> PASS
#### Warnings ####
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-skl: FAIL [fdo#103191] / [fdo#103232] -> INCOMPLETE [fdo#104108] / [fdo#107773]
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#109801]: https://bugs.freedesktop.org/show_bug.cgi?id=109801
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 9)
------------------------------
Missing (1): shard-hsw
Build changes
-------------
* Linux: CI_DRM_5863 -> Patchwork_12674
CI_DRM_5863: d2c849411d8ae6de9c718b9c0cd1e00da7f0f121 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4924: bcf2f21996b2ee5c6177f5412046690ff8017772 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12674: 5f226a4e31cdc3bbb9c26c1d6d58e6a8d582b7e9 @ 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_12674/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for drm/i915: add Makefile magic for testing headers are self-contained (rev4)
Quoted 28 lines · Patchwork
== Series Details ==
Series: drm/i915: add
Makefilemagic for testing headers are self-contained (rev4)
URL : https://patchwork.freedesktop.org/series/58938/
State : failure== Summary ==
CI Bug Log - changes from
CI_DRM_5863_full->Patchwork_12674_full
====================================================Summary
-------**FAILURE**
Serious unknown changes coming with
Patchwork_12674_fullabsolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_12674_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.Possible new issues
-------------------
Quoted 8 lines
Here are the unknown changes that may have been introduced in
Patchwork_12674_full:### IGT changes ###
#### Possible regressions ####
* igt@gem_eio@reset-stress:
- shard-skl: PASS -> DMESG-WARN
Pushed, I'm pretty sure testing headers has no impact here.
BR,
Jani.
Quoted 167 lines
Known issues
------------Here are the changes found in
Patchwork_12674_fullthat come from known issues:### IGT changes ###
#### Issues hit ####
* igt@gem_ppgtt@blt-vs-render-ctxn:
- shard-iclb: PASS -> INCOMPLETE [fdo#109801]* igt@gem_userptr_blits@process-exit-gtt:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +44* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#110222] +1* igt@kms_busy@extended-pageflip-hang-oldfb-render-f:
- shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
- shard-apl: PASS -> DMESG-WARN [fdo#110222]* igt@kms_chamelium@hdmi-crc-fast:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +83* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: NOTRUN -> FAIL [fdo#103232]* igt@kms_cursor_legacy@cursor-vs-flip-atomic:
- shard-iclb: PASS -> FAIL [fdo#103355] +1* igt@kms_flip@2x-modeset-vs-vblank-race:
- shard-glk: PASS -> FAIL [fdo#103060]* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-iclb: PASS -> FAIL [fdo#105363]
- shard-skl: PASS -> FAIL [fdo#105363]* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: PASS -> FAIL [fdo#103167] +4* igt@kms_frontbuffer_tracking@psr-1p-primscrn-indfb-plflip-blt:
- shard-skl: PASS -> FAIL [fdo#103167]* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-iclb: PASS -> FAIL [fdo#109247] +18* igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-shrfb-draw-mmap-gtt:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +1* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-f:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +10* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-skl: NOTRUN -> INCOMPLETE [fdo#104108]* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: PASS -> FAIL [fdo#108145]* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815]* igt@kms_psr@primary_mmap_gtt:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215]#### Possible fixes ####
* igt@gem_tiled_pread_pwrite:
- shard-iclb: TIMEOUT [fdo#109673] -> PASS* igt@i915_pm_rpm@system-suspend-devices:
- shard-skl: INCOMPLETE [fdo#107807] -> PASS* igt@kms_cursor_crc@cursor-128x42-offscreen:
- shard-skl: FAIL [fdo#103232] -> PASS* igt@kms_cursor_edge_walk@pipe-a-128x128-left-edge:
- shard-snb: SKIP [fdo#109271] / [fdo#109278] -> PASS* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-glk: FAIL [fdo#104873] -> PASS* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: FAIL [fdo#102887] / [fdo#105363] -> PASS* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-iclb: FAIL [fdo#103167] -> PASS +14* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-wc:
- shard-iclb: FAIL [fdo#109247] -> PASS +21* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-pwrite:
- shard-iclb: FAIL [fdo#105682] / [fdo#109247] -> PASS +3* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: FAIL [fdo#108145] -> PASS* igt@kms_psr2_su@page_flip:
- shard-iclb: SKIP [fdo#109642] -> PASS* igt@kms_psr@cursor_mmap_gtt:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS +4* igt@kms_psr@psr2_cursor_render:
- shard-iclb: SKIP [fdo#109441] -> PASS +1* igt@kms_setmode@basic:
- shard-kbl: FAIL [fdo#99912] -> PASS#### Warnings ####
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-skl: FAIL [fdo#103191] / [fdo#103232] -> INCOMPLETE [fdo#104108] / [fdo#107773][fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#109801]: https://bugs.freedesktop.org/show_bug.cgi?id=109801
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912Participating hosts (10 -> 9)
------------------------------Missing (1): shard-hsw
Build changes
-------------* Linux:
CI_DRM_5863->Patchwork_12674
CI_DRM_5863:d2c849411d8ae6de9c718b9c0cd1e00da7f0f121@git://anongit.freedesktop.org/gfx-ci/linux
IGT_4924:bcf2f21996b2ee5c6177f5412046690ff8017772@git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12674:5f226a4e31cdc3bbb9c26c1d6d58e6a8d582b7e9@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_12674/
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx