Hello, please, advise: do we need such Intel-specific test? Or there is no sense in spending time on similar cases?
On Wed, Oct 24, 2018 at 8:49 PM Mark Janes <mark.a.ja...@intel.com> wrote: > Tested-by: Mark Janes <mark.a.ja...@intel.com> > > Sergii Romantsov <sergii.romant...@gmail.com> writes: > > > Intel ppgtt-model requires memory addresses to be aligned by page size. > > Test explores cases with cached memory-buckets and sizes above cached. > > > > CC: Kenneth Graunke <kenn...@whitecape.org> > > CC: Lionel G Landwerlin <lionel.g.landwer...@intel.com> > > CC: Chris Wilson <ch...@chris-wilson.co.uk> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106997 > > Tests: 24839663a402 (intel/ppgtt: memory address alignment) > > Tests: a363bb2cd0e2 (i965: Allocate VMA in userspace for full-PPGTT > systems.) > > Signed-off-by: Sergii Romantsov <sergii.romant...@globallogic.com> > > --- > > tests/general/CMakeLists.gl.txt | 1 + > > tests/general/ppgtt_memory_alignment.c | 124 > +++++++++++++++++++++++++++++++++ > > tests/opengl.py | 1 + > > 3 files changed, 126 insertions(+) > > create mode 100644 tests/general/ppgtt_memory_alignment.c > > > > diff --git a/tests/general/CMakeLists.gl.txt > b/tests/general/CMakeLists.gl.txt > > index 83189fc..7b43f84 100644 > > --- a/tests/general/CMakeLists.gl.txt > > +++ b/tests/general/CMakeLists.gl.txt > > @@ -91,6 +91,7 @@ piglit_add_executable (polygon-mode-offset > polygon-mode-offset.c) > > piglit_add_executable (polygon-mode-facing polygon-mode-facing.c) > > piglit_add_executable (polygon-mode polygon-mode.c) > > piglit_add_executable (polygon-offset polygon-offset.c) > > +piglit_add_executable (ppgtt_memory_alignment ppgtt_memory_alignment.c) > > piglit_add_executable (primitive-restart primitive-restart.c) > > piglit_add_executable (primitive-restart-draw-mode > primitive-restart-draw-mode.c) > > piglit_add_executable (provoking-vertex provoking-vertex.c) > > diff --git a/tests/general/ppgtt_memory_alignment.c > b/tests/general/ppgtt_memory_alignment.c > > new file mode 100644 > > index 0000000..b5db532 > > --- /dev/null > > +++ b/tests/general/ppgtt_memory_alignment.c > > @@ -0,0 +1,124 @@ > > +/* > > + * Copyright © 2018 Sergii Romantsov (<sergii.romant...@gmail.com>) > > + * > > + * Permission is hereby granted, free of charge, to any person > obtaining a > > + * copy of this software and associated documentation files (the > "Software"), > > + * to deal in the Software without restriction, including without > limitation > > + * the rights to use, copy, modify, merge, publish, distribute, > sublicense, > > + * and/or sell copies of the Software, and to permit persons to whom the > > + * Software is furnished to do so, subject to the following conditions: > > + * > > + * The above copyright notice and this permission notice (including the > next > > + * paragraph) shall be included in all copies or substantial portions > of the > > + * Software. > > + * > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > EXPRESS OR > > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > MERCHANTABILITY, > > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT > SHALL > > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR > OTHER > > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > ARISING > > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > DEALINGS > > + * IN THE SOFTWARE. > > + * > > + * Created on: Oct 11, 2018 > > + * Author: Sergii Romantsov > > + * > > + * Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106997 > > + * Tests: 24839663a402 (intel/ppgtt: memory address alignment) > > + * Tests: a363bb2cd0e2 (i965: Allocate VMA in userspace for full-PPGTT > systems.) > > + */ > > + > > + > > +#include "piglit-util-gl.h" > > +#include "unistd.h" > > + > > +PIGLIT_GL_TEST_CONFIG_BEGIN > > + > > + config.supports_gl_compat_version = 10; > > + > > + config.window_visual = PIGLIT_GL_VISUAL_RGB | > PIGLIT_GL_VISUAL_DOUBLE; > > + config.requires_displayed_window = true; > > + > > +PIGLIT_GL_TEST_CONFIG_END > > + > > +static enum piglit_result g_result = PIGLIT_FAIL; > > +static GLuint g_cur_size = 0; > > +static GLubyte *g_buffer = NULL; > > + > > +static void > > +free_buffer(void) > > +{ > > + if (g_buffer) > > + { > > + free(g_buffer); > > + g_buffer = NULL; > > + } > > +} > > + > > +static void > > +test_fail_check(void) > > +{ > > + /* Intel: Function is needed to check fail-status of execution: > > + * currently if batch-buffer wasn't submitted than Mesa will exit > application. > > + * Otherwise piglit_display has logic to detect fail across call > glGetError. > > + */ > > + if (g_result != PIGLIT_PASS) > > + { > > + fprintf(stderr, "Test failed for buffer size: %x \n", > g_cur_size); > > + free_buffer(); > > + piglit_report_result(g_result); > > + } > > +} > > + > > +enum piglit_result > > +piglit_display(void) > > +{ > > + /* Maximal value of cache-size supported by driver */ > > + const GLsizei cache_max_size = 64 * 1024 * 1024; > > + const GLsizei cache_extra_size = cache_max_size * 16; > > + const unsigned int page_size = getpagesize(); > > + const GLsizei size_inconsistency = page_size / 4 + 1; > > + GLsizei size = 0; > > + GLuint buf; > > + bool is_error = false; > > + > > + if (!g_buffer) > > + g_buffer = calloc(sizeof(GLubyte), cache_extra_size); > > + > > + glClearColor(0.5, 0.5, 0.5, 1.0); > > + glClear(GL_COLOR_BUFFER_BIT); > > + > > + glGenBuffers(1, &buf); > > + glBindBuffer(GL_ARRAY_BUFFER, buf); > > + > > + while (size < cache_extra_size) > > + { > > + glBufferData(GL_ARRAY_BUFFER, g_cur_size, g_buffer, > GL_STATIC_DRAW); > > + glVertexAttribPointer(0, 3, GL_UNSIGNED_BYTE, GL_FALSE, 0, > 0); > > + glEnableVertexAttribArray(0); > > + > > + glDrawArrays(GL_TRIANGLES, 0, 1); > > + if (glGetError() != GL_NO_ERROR) > > + is_error = true; > > + > > + g_cur_size = size + size_inconsistency; > > + size = size ? size * 2 : page_size; > > + > > + glFlush(); > > + if (glGetError() != GL_NO_ERROR) > > + is_error = true; > > + } > > + > > + glDeleteBuffers(1, &buf); > > + > > + free_buffer(); > > + > > + g_result = is_error ? PIGLIT_FAIL : PIGLIT_PASS; > > + return g_result; > > +} > > + > > +void > > +piglit_init(int argc, char **argv) > > +{ > > + atexit(test_fail_check); > > +} > > diff --git a/tests/opengl.py b/tests/opengl.py > > index f7e408c..917c5a1 100644 > > --- a/tests/opengl.py > > +++ b/tests/opengl.py > > @@ -669,6 +669,7 @@ with profile.test_list.group_manager( > > g(['polygon-mode-facing']) > > g(['polygon-mode-offset']) > > g(['polygon-offset']) > > + g(['ppgtt_memory_alignment']) > > g(['push-pop-texture-state']) > > g(['quad-invariance']) > > g(['readpix-z']) > > -- > > 2.7.4 > > > > _______________________________________________ > > Piglit mailing list > > Piglit@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/piglit >
_______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
