On 15/03/2024 08:12, Vignesh Raman wrote:
Hi Helen,
On 07/03/24 19:05, Helen Koike wrote:
On 06/03/2024 00:06, Vignesh Raman wrote:
Uprev IGT and add amd, v3d, vc4 and vgem specific
tests to testlist. Have testlist.txt per driver
and include a base testlist so that the driver
specific tests will run only on those hardware.
Also add testlists to the MAINTAINERS file.
Signed-off-by: Vignesh Raman <vignesh.raman@xxxxxxxxxxxxx>
---
v3:
- New patch in series to uprev IGT and update testlist.
v4:
- Add testlists to the MAINTAINERS file and remove amdgpu xfails
changes.
---
MAINTAINERS | 11 ++
drivers/gpu/drm/ci/gitlab-ci.yml | 2 +-
drivers/gpu/drm/ci/igt_runner.sh | 12 +-
drivers/gpu/drm/ci/testlist-amdgpu.txt | 151 +++++++++++++++++++++++
drivers/gpu/drm/ci/testlist-msm.txt | 50 ++++++++
drivers/gpu/drm/ci/testlist-panfrost.txt | 17 +++
drivers/gpu/drm/ci/testlist-v3d.txt | 73 +++++++++++
drivers/gpu/drm/ci/testlist-vc4.txt | 49 ++++++++
drivers/gpu/drm/ci/testlist.txt | 84 ++++++-------
9 files changed, 398 insertions(+), 51 deletions(-)
create mode 100644 drivers/gpu/drm/ci/testlist-amdgpu.txt
create mode 100644 drivers/gpu/drm/ci/testlist-msm.txt
create mode 100644 drivers/gpu/drm/ci/testlist-panfrost.txt
create mode 100644 drivers/gpu/drm/ci/testlist-v3d.txt
create mode 100644 drivers/gpu/drm/ci/testlist-vc4.txt
diff --git a/MAINTAINERS b/MAINTAINERS
index 3bc7e122a094..4da66ca92f1a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1665,6 +1665,8 @@ L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
S: Supported
T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/gpu/panfrost.rst
+F: drivers/gpu/drm/ci/testlist-panfrost.txt
+F: drivers/gpu/drm/ci/testlist.txt
I wonder if we should have both here, since the second is not used right?
Yes, we need to use both here. testlist-panfrost.txt includes
testlist.txt. So we have moved the driver specific tests to
testlist-panfrost.txt and have a base testlist.txt.
diff --git a/drivers/gpu/drm/ci/igt_runner.sh
b/drivers/gpu/drm/ci/igt_runner.sh
index f1a08b9b146f..77cd81fe6d1a 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -74,10 +74,20 @@ if ! grep -q "core_getversion"
/install/testlist.txt; then
fi
set +e
+if [ "$DRIVER_NAME" = "amdgpu" ]; then
+ TEST_LIST="/install/testlist-amdgpu.txt"
+elif [ "$DRIVER_NAME" = "msm" ]; then
+ TEST_LIST="/install/testlist-msm.txt"
+elif [ "$DRIVER_NAME" = "panfrost" ]; then
+ TEST_LIST="/install/testlist-panfrost.txt"
+else
+ TEST_LIST="/install/testlist.txt"
+fi
Maybe simplify this with:
TEST_LIST="/install/testlist-$DRIVER_NAME.txt"
if [ ! -f "$TEST_LIST" ]; then
TEST_LIST="/install/testlist.txt"
fi
Yes, this is much better. Thanks.
Another question I have: shouldn't testlist-$DRIVER_NAME.txt and
testlist.txt be merged? Or they are really mutually exclusive?
We have testlist-$DRIVER_NAME.txt per driver and it includes a base
testlist.txt
I'm confused, it seems that from the code or it uses
testlist-$DRIVER_NAME.txt or it uses testlist.txt, you don't merge them
by code, which means that drivers don't need to follow changes to
testlist.txt.
If testlist-$DRIVER_NAME.txt already includes tests in testlist.txt,
than testlist.txt doesn't need to be added in the MAINTEINERS file in
all drivers.
Helen
Regards,
Vignesh
