[Piglit] [PATCH] framework/test: Add default 1min timeout to all OpenCL tests
From: Jan Vesely Signed-off-by: Jan Vesely --- framework/test/piglit_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py index 166c2f792ca..b4e6eb444e0 100644 --- a/framework/test/piglit_test.py +++ b/framework/test/piglit_test.py @@ -215,6 +215,7 @@ class PiglitCLTest(PiglitBaseTest): # pylint: disable=too-few-public-methods """ def __init__(self, command, run_concurrent=CL_CONCURRENT, **kwargs): +self.timeout = 60 super(PiglitCLTest, self).__init__(command, run_concurrent, **kwargs) -- 2.21.0 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] cl: Add tests for some cases that were broken with function calls
On Wed, 2019-06-05 at 17:48 -0400, Matt Arsenault wrote: > > On Jun 3, 2019, at 12:46 PM, Jan Vesely wrote: > > > > Does rocm do anything special other than using compute rings? > > What was the HW you tested? > I don’t think so. This is on gfx900 > > > > I checked that raven can reboot after gpu hangs/crashes (not suspend, > > but that's probably one of many raven problems). I'd like to check > > carrizo/iceland too, as that's the machine that get accessed remotely. > > > > Other than that I think it's OK to just put default 30s timeout on all > > CL tests, even debug build of LLVM shouldn't need more than that. > > Do you know where this goes? The test base class has a timeout attribute, and the invocation uses self.timoute. I think just adding self.timeout = 30 to PiglitCLTest constructor should suffice, adding a timeout attribute to the PiglitCLTest class might work as well. Dylan, is there a preferred way to do this? will the commandline -- timeout take precedence? Jan -- Jan Vesely signature.asc Description: This is a digitally signed message part ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] cl: Add tests for some cases that were broken with function calls
> On Jun 3, 2019, at 12:46 PM, Jan Vesely wrote: > > Does rocm do anything special other than using compute rings? > What was the HW you tested? I don’t think so. This is on gfx900 > I checked that raven can reboot after gpu hangs/crashes (not suspend, > but that's probably one of many raven problems). I'd like to check > carrizo/iceland too, as that's the machine that get accessed remotely. > > Other than that I think it's OK to just put default 30s timeout on all > CL tests, even debug build of LLVM shouldn't need more than that. Do you know where this goes?___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] framework/test: allow to set extra args with PIGLIT_VKRUNNER_EXTRA_ARGS
vkrunner recently added a new option (--device-id=) for selecting
the physical device. This is quite useful in a multi-GPU scenario.
This allows to set some vkrunner options via vkrunner:extra_args
in the configuration file or with PIGLIT_VKRUNNER_EXTRA_ARGS.
Signed-off-by: Samuel Pitoiset
---
framework/test/piglit_test.py | 9 -
piglit.conf.example | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py
index 166c2f792..152355e3d 100644
--- a/framework/test/piglit_test.py
+++ b/framework/test/piglit_test.py
@@ -243,15 +243,22 @@ class VkRunnerTest(PiglitBaseTest):
vkrunner_bin = core.PIGLIT_CONFIG.safe_get(
'vkrunner', 'bin', fallback='vkrunner')
+extra_args = os.environ.get('PIGLIT_VKRUNNER_EXTRA_ARGS')
+
+if extra_args is None:
+extra_args = core.PIGLIT_CONFIG.safe_get(
+'vkrunner', 'extra_args', fallback='')
+
super(VkRunnerTest, self).__init__(
[vkrunner_bin],
run_concurrent=True)
self.filename = filename
+self.extra_args = extra_args.split()
@PiglitBaseTest.command.getter
def command(self):
# self._command is used because we don't want PiglitBaseTest
# to prepend TEST_BIN_DIR so that it will look for vkrunner in
# the search path.
-return self._command + [os.path.join(ROOT_DIR, self.filename)]
+return self._command + self.extra_args + [os.path.join(ROOT_DIR,
self.filename)]
diff --git a/piglit.conf.example b/piglit.conf.example
index 1877187df..1fd9ebc48 100644
--- a/piglit.conf.example
+++ b/piglit.conf.example
@@ -190,6 +190,7 @@ run_test=./%(test_name)s
[vkrunner]
; Path to the VkRunner executable
; bin=/home/neil/local/bin/vkrunner
+; extra_args=--device-id=1
[expected-failures]
; Provide a list of test names that are expected to fail. These tests
--
2.21.0
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH] README.md: update test sets documentation
Since commit "tests: use meta profiles" (400dcd5cf18ac51ab8e9681d8ecab4132986efbd) some test sets are not represented anymore as python scripts. So first, it would be good to mention it, and second it would be good to mention that it would be better to run the test sets using the set name, not directly the python script. --- README.md | 48 1 file changed, 32 insertions(+), 16 deletions(-) Thanks Dylan for the feedback for the RFC one. I have just included your feedback, and removed the RFC. Im plenty sure that there are some grammar mistakes, but I think that this is more or less the info that we need. diff --git a/README.md b/README.md index 7366893f8..e4b3c651b 100644 --- a/README.md +++ b/README.md @@ -313,28 +313,44 @@ available, then this completion file will be installed system-wide. ## 4. Available test sets -Test sets are specified as Python scripts in the tests directory. -The following test sets are currently available: +Test sets are specified as Python scripts or as xml files in the tests +directory. As there are two different formats, the easier way to run a +test set is using the name. So for example, although the following +would work: + ./piglit run tests/opengl.py opengl_results -c + +It is more convenient to do the following: + + ./piglit run opengl opengl_results -c + +As for running the all test suite you need to do this: + + ./piglit run all all_results -c ### 4.1 OpenGL Tests - - **sanity.py** This suite contains minimal OpenGL sanity tests. These tests + - **sanity** This suite contains minimal OpenGL sanity tests. These tests must pass, otherwise the other tests will not generate reliable results. - - **all.py** This suite contains all OpenGL tests. - - **quick.py** Run all tests, but cut down significantly on their runtime -(and thus on the number of problems they can find). - - **gpu.py** A further reduced set of tests from quick.py, this runs tests -only for hardware functionality and not tests for the software stack. - - **llvmpipe.py** A reduced set of tests from gpu.py removing tests that are -problematic using llvmpipe - - **cpu.py** This profile runs tests that don't touch the gpu, in other words -all of the tests in quick.py that are not run by gpu.py - - **glslparser.py** A subset of all.py which runs only glslparser tests - - **shader.py** A subset of all.py which runs only shader tests - - **no_error.py** A modified version of the test list run as khr_no_error + - **glslparser** test set that includes the tests run by glslparser. + - **shader** all shader_test tests, being run by shader_runner. + - **no_error** A modified version of the test list run as khr_no_error variants - + - **quick_gl**: This profile filters out a number of very slow + opengl tests, and tests that are very exhaustively tested, since + they add a good deal of runtime to piglit. + - **quick_shader**: Equivalent to quick_gl, but for shader_test (run + by shader_runner) tests. + - **llvmpipe_gl** A filtered test set, removing tests that are + problematic using llvmpipe + - **llvmpipe** llvmpipe + quick_shader test set + - **gpu**: Profile that includes the "quick" test sets that are + efectively executed (not just compiled), so it includes quick_gl + + quick_shader + - **quick** Profile with including all the "quick" test sets. So + it includes quick_gl + quick_shader + glslparser + - **all** This suite contains all OpenGL tests. So it is opengl + + shader + glslparser ### 4.2 OpenCL Tests -- 2.19.1 ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
