tests/amdgpu: add dispatch hang test
PATCH 1/4 tests/amdgpu: add dispatch hang test
add compute/gfx dispatch hang test for gfx9
Signed-off-by Flora Cui <[email protected]>
--- tests/amdgpu/amdgpu_test.c | 12 +++++++ tests/amdgpu/amdgpu_test.h | 1 + tests/amdgpu/basic_tests.c | 67 ++++++++++++++++++++++++++++------- tests/amdgpu/deadlock_tests.c | 14 ++++++++ 4 files changed, 81 insertions(+), 13 deletions(-)
tests/amdgpu/amdgpu_test.c +12 -0
@@ -460,6 +460,18 @@ static void amdgpu_disable_suites() "illegal mem access test (set amdgpu.vm_fault_stop=2)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +/* This test was ran on GFX9 only */ +//if (family_id < AMDGPU_FAMILY_AI || family_id > AMDGPU_FAMILY_RV) +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"gfx ring bad dispatch test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); + +/* This test was ran on GFX9 only */ +//if (family_id < AMDGPU_FAMILY_AI || family_id > AMDGPU_FAMILY_RV) +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"compute ring bad dispatch test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());
tests/amdgpu/amdgpu_test.h +1 -0
@@ -241,6 +241,7 @@ CU_BOOL suite_syncobj_timeline_tests_enable(void);*/ extern CU_TestInfo syncobj_timeline_tests[]; +void amdgpu_dispatch_hang_helper (amdgpu_device_handle device_handle,uint32_t ip_type);/** * Helper functions
tests/amdgpu/basic_tests.c +54 -13
122 lines not on this page · raw message
tests/amdgpu/deadlock_tests.c +14 -0
@@ -114,6 +114,8 @@ static void amdgpu_deadlock_compute(void);static void amdgpu_illegal_reg_access ();static void amdgpu_illegal_mem_access ();static void amdgpu_deadlock_sdma (void ); +static void amdgpu_dispatch_hang_gfx (void ); +static void amdgpu_dispatch_hang_compute (void );CU_BOOL suite_deadlock_tests_enable (void ) {
@@ -188,6 +190,8 @@ CU_TestInfo deadlock_tests[] = { { "sdma ring block test (set amdgpu.lockup_timeout=50)", amdgpu_deadlock_sdma }, { "illegal reg access test", amdgpu_illegal_reg_access }, { "illegal mem access test (set amdgpu.vm_fault_stop=2)", amdgpu_illegal_mem_access }, + { "gfx ring bad dispatch test (set amdgpu.lockup_timeout=50)", amdgpu_dispatch_hang_gfx }, + { "compute ring bad dispatch test (set amdgpu.lockup_timeout=50,50)", amdgpu_dispatch_hang_compute }, CU_TEST_INFO_NULL, };
@@ -488,3 +492,13 @@ static void amdgpu_illegal_mem_access() {bad_access_helper (0 ); } + +static void amdgpu_dispatch_hang_gfx (void ) +{ +amdgpu_dispatch_hang_helper (device_handle,AMDGPU_HW_IP_GFX ); +} + +static void amdgpu_dispatch_hang_compute (void ) +{ +amdgpu_dispatch_hang_helper (device_handle,AMDGPU_HW_IP_COMPUTE ); +}
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/4 tests/amdgpu: add bad slow dispatch test
add gfx/compute bad slow dispatch test for gfx9
Signed-off-by Flora Cui <[email protected]>
--- tests/amdgpu/amdgpu_test.c | 12 ++ tests/amdgpu/amdgpu_test.h | 1 + tests/amdgpu/basic_tests.c | 229 +++++++++++++++++++++++++++++++++- tests/amdgpu/deadlock_tests.c | 14 +++ 4 files changed, 255 insertions(+), 1 deletion(-)
tests/amdgpu/amdgpu_test.c +12 -0
@@ -472,6 +472,18 @@ static void amdgpu_disable_suites() "compute ring bad dispatch test (set amdgpu.lockup_timeout=50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +/* This test was ran on GFX9 only */ +//if (family_id < AMDGPU_FAMILY_AI || family_id > AMDGPU_FAMILY_RV) +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"gfx ring bad slow dispatch test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); + +/* This test was ran on GFX9 only */ +//if (family_id < AMDGPU_FAMILY_AI || family_id > AMDGPU_FAMILY_RV) +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"compute ring bad slow dispatch test (set amdgpu.lockup_timeout=50,50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());
tests/amdgpu/amdgpu_test.h +1 -0
@@ -242,6 +242,7 @@ CU_BOOL suite_syncobj_timeline_tests_enable(void);extern CU_TestInfo syncobj_timeline_tests[];void amdgpu_dispatch_hang_helper (amdgpu_device_handle device_handle,uint32_t ip_type); +void amdgpu_dispatch_hang_slow_helper (amdgpu_device_handle device_handle,uint32_t ip_type);/** * Helper functions
tests/amdgpu/basic_tests.c +228 -1
253 lines not on this page · raw message
tests/amdgpu/deadlock_tests.c +14 -0
@@ -116,6 +116,8 @@ static void amdgpu_illegal_mem_access();static void amdgpu_deadlock_sdma (void );static void amdgpu_dispatch_hang_gfx (void );static void amdgpu_dispatch_hang_compute (void ); +static void amdgpu_dispatch_hang_slow_gfx (void ); +static void amdgpu_dispatch_hang_slow_compute (void );CU_BOOL suite_deadlock_tests_enable (void ) {
@@ -192,6 +194,8 @@ CU_TestInfo deadlock_tests[] = { { "illegal mem access test (set amdgpu.vm_fault_stop=2)", amdgpu_illegal_mem_access }, { "gfx ring bad dispatch test (set amdgpu.lockup_timeout=50)", amdgpu_dispatch_hang_gfx }, { "compute ring bad dispatch test (set amdgpu.lockup_timeout=50,50)", amdgpu_dispatch_hang_compute }, + { "gfx ring bad slow dispatch test (set amdgpu.lockup_timeout=50)", amdgpu_dispatch_hang_slow_gfx }, + { "compute ring bad slow dispatch test (set amdgpu.lockup_timeout=50,50)", amdgpu_dispatch_hang_slow_compute }, CU_TEST_INFO_NULL, };
@@ -502,3 +506,13 @@ static void amdgpu_dispatch_hang_compute(void) {amdgpu_dispatch_hang_helper (device_handle,AMDGPU_HW_IP_COMPUTE ); } + +static void amdgpu_dispatch_hang_slow_gfx (void ) +{ +amdgpu_dispatch_hang_slow_helper (device_handle,AMDGPU_HW_IP_GFX ); +} + +static void amdgpu_dispatch_hang_slow_compute (void ) +{ +amdgpu_dispatch_hang_slow_helper (device_handle,AMDGPU_HW_IP_COMPUTE ); +}
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/4 tests/amdgpu: add gfx ring draw hang test
In reply to Flora Cuifor gfx9
Signed-off-by Flora Cui <[email protected]>
--- tests/amdgpu/amdgpu_test.c | 5 +++++ tests/amdgpu/amdgpu_test.h | 3 ++- tests/amdgpu/basic_tests.c | 41 ++++++++++++++++++++++++----------- tests/amdgpu/deadlock_tests.c | 20 +++++++++++++++++ 4 files changed, 55 insertions(+), 14 deletions(-)
tests/amdgpu/amdgpu_test.c +5 -0
@@ -484,6 +484,11 @@ static void amdgpu_disable_suites() "compute ring bad slow dispatch test (set amdgpu.lockup_timeout=50,50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +//if (family_id < AMDGPU_FAMILY_AI || family_id > AMDGPU_FAMILY_RV) +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"gfx ring bad draw test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());
tests/amdgpu/amdgpu_test.h +2 -1
@@ -243,7 +243,8 @@ extern CU_TestInfo syncobj_timeline_tests[];void amdgpu_dispatch_hang_helper (amdgpu_device_handle device_handle,uint32_t ip_type);void amdgpu_dispatch_hang_slow_helper (amdgpu_device_handle device_handle,uint32_t ip_type); - +void amdgpu_memcpy_draw_test (amdgpu_device_handle device_handle,uint32_t ring, +int hang);/** * Helper functions */
tests/amdgpu/basic_tests.c +28 -13
96 lines not on this page · raw message
tests/amdgpu/deadlock_tests.c +20 -0
@@ -118,6 +118,7 @@ static void amdgpu_dispatch_hang_gfx(void);static void amdgpu_dispatch_hang_compute (void );static void amdgpu_dispatch_hang_slow_gfx (void );static void amdgpu_dispatch_hang_slow_compute (void ); +static void amdgpu_draw_hang_gfx (void );CU_BOOL suite_deadlock_tests_enable (void ) {
@@ -196,6 +197,7 @@ CU_TestInfo deadlock_tests[] = { { "compute ring bad dispatch test (set amdgpu.lockup_timeout=50,50)", amdgpu_dispatch_hang_compute }, { "gfx ring bad slow dispatch test (set amdgpu.lockup_timeout=50)", amdgpu_dispatch_hang_slow_gfx }, { "compute ring bad slow dispatch test (set amdgpu.lockup_timeout=50,50)", amdgpu_dispatch_hang_slow_compute }, + { "gfx ring bad draw test (set amdgpu.lockup_timeout=50)", amdgpu_draw_hang_gfx }, CU_TEST_INFO_NULL, };
@@ -516,3 +518,21 @@ static void amdgpu_dispatch_hang_slow_compute(void) {amdgpu_dispatch_hang_slow_helper (device_handle,AMDGPU_HW_IP_COMPUTE ); } + +static void amdgpu_draw_hang_gfx (void ) +{ +int r; +struct drm_amdgpu_info_hw_ip info; +uint32_t ring_id; + + r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_GFX ,0 , &info); +CU_ASSERT_EQUAL (r,0 ); +if (!info.available_rings) +printf ("SKIP ... as there's no graphic ring\n" ); + +for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { +amdgpu_memcpy_draw_test (device_handle, ring_id,0 ); +amdgpu_memcpy_draw_test (device_handle, ring_id,1 ); +amdgpu_memcpy_draw_test (device_handle, ring_id,0 ); + } +}
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/4 tests/amdgpu: add gfx ring bad slow draw test
In reply to Flora Cuifor gfx9
Signed-off-by Flora Cui <[email protected]>
--- tests/amdgpu/amdgpu_test.c | 6 + tests/amdgpu/amdgpu_test.h | 2 + tests/amdgpu/basic_tests.c | 239 ++++++++++++++++++++++++++++++++-- tests/amdgpu/deadlock_tests.c | 18 +++ 4 files changed, 251 insertions(+), 14 deletions(-)
tests/amdgpu/amdgpu_test.c +6 -0
@@ -489,6 +489,12 @@ static void amdgpu_disable_suites() "gfx ring bad draw test (set amdgpu.lockup_timeout=50)", CU_FALSE))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +/* This test was ran on GFX9 only */ +//if (family_id < AMDGPU_FAMILY_AI || family_id > AMDGPU_FAMILY_RV) +if (amdgpu_set_test_active (DEADLOCK_TESTS_STR , +"gfx ring slow bad draw test (set amdgpu.lockup_timeout=50)" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); +if (amdgpu_set_test_active (BO_TESTS_STR ,"Metadata" ,CU_FALSE ))fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ());
tests/amdgpu/amdgpu_test.h +2 -0
@@ -245,6 +245,8 @@ void amdgpu_dispatch_hang_helper(amdgpu_device_handle device_handle, uint32_t ipvoid amdgpu_dispatch_hang_slow_helper (amdgpu_device_handle device_handle,uint32_t ip_type);void amdgpu_memcpy_draw_test (amdgpu_device_handle device_handle,uint32_t ring,int hang); +void amdgpu_memcpy_draw_hang_slow_test (amdgpu_device_handle device_handle,uint32_t ring); +/** * Helper functions */
tests/amdgpu/basic_tests.c +225 -14
321 lines not on this page · raw message
tests/amdgpu/deadlock_tests.c +18 -0
@@ -119,6 +119,7 @@ static void amdgpu_dispatch_hang_compute(void);static void amdgpu_dispatch_hang_slow_gfx (void );static void amdgpu_dispatch_hang_slow_compute (void );static void amdgpu_draw_hang_gfx (void ); +static void amdgpu_draw_hang_slow_gfx (void );CU_BOOL suite_deadlock_tests_enable (void ) {
@@ -198,6 +199,7 @@ CU_TestInfo deadlock_tests[] = { { "gfx ring bad slow dispatch test (set amdgpu.lockup_timeout=50)", amdgpu_dispatch_hang_slow_gfx }, { "compute ring bad slow dispatch test (set amdgpu.lockup_timeout=50,50)", amdgpu_dispatch_hang_slow_compute }, { "gfx ring bad draw test (set amdgpu.lockup_timeout=50)", amdgpu_draw_hang_gfx }, + { "gfx ring slow bad draw test (set amdgpu.lockup_timeout=50)", amdgpu_draw_hang_slow_gfx }, CU_TEST_INFO_NULL, };
@@ -536,3 +538,19 @@ static void amdgpu_draw_hang_gfx(void)amdgpu_memcpy_draw_test (device_handle, ring_id,0 ); } } + +static void amdgpu_draw_hang_slow_gfx (void ) +{ +struct drm_amdgpu_info_hw_ip info; +uint32_t ring_id; +int r; + + r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_GFX ,0 , &info); +CU_ASSERT_EQUAL (r,0 ); + +for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { +amdgpu_memcpy_draw_test (device_handle, ring_id,0 ); +amdgpu_memcpy_draw_hang_slow_test (device_handle, ring_id); +amdgpu_memcpy_draw_test (device_handle, ring_id,0 ); + } +}
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel