tests/amdgpu: fix for dispatch/draw test
PATCH 1/2 tests/amdgpu: fix for dispatch/draw test
1. skip test if there's no desired ring
2. clear shader buffer
3. update command buffer for gfx9
--- tests/amdgpu/basic_tests.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)
tests/amdgpu/basic_tests.c +28 -8
@@ -329,14 +329,15 @@ static const uint32_t preamblecache_gfx9[] = {0xc0016900 ,0x2d5 ,0x10000 ,0xc0016900 ,0x2dc ,0x0 ,0xc0066900 ,0x2de ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0026900 ,0x2e5 ,0x0 ,0x0 ,0xc0056900 ,0x2f9 ,0x5 ,0x3f800000 ,0x3f800000 ,0x3f800000 ,0x3f800000 , -0xc0026900 ,0x311 ,0x3 ,0x0 ,0xc0026900 ,0x316 ,0x1e ,0x20 , +0xc0036900 ,0x311 ,0x3 ,0 ,0x100000 ,0xc0026900 ,0x316 ,0x1e ,0x20 ,0xc0016900 ,0x349 ,0x0 ,0xc0016900 ,0x358 ,0x0 ,0xc0016900 ,0x367 ,0x0 ,0xc0016900 ,0x376 ,0x0 ,0xc0016900 ,0x385 ,0x0 ,0xc0016900 ,0x19 ,0x0 ,0xc0056900 ,0xe8 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0076900 ,0x1e1 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0026900 ,0x204 ,0x90000 ,0x4 ,0xc0046900 ,0x20c ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0016900 ,0x2b2 ,0x0 ,0xc0026900 ,0x30e ,0xffffffff ,0xffffffff , -0xc0016900 ,0x314 ,0x0 ,0xc0002f00 ,0x1 ,0xc0016900 ,0x1 ,0x1 , +0xc0016900 ,0x314 ,0x0 ,0xc0016900 ,0x2a6 ,0 ,0xc0016900 ,0x210 ,0 , +0xc0002f00 ,0x1 ,0xc0016900 ,0x1 ,0x1 ,0xc0016900 ,0x18 ,0x2 ,0xc0016900 ,0x206 ,0x300 ,0xc0017900 ,0x20000243 ,0x0 ,0xc0017900 ,0x248 ,0xffffffff ,0xc0017900 ,0x249 ,0x0 ,0xc0017900 ,0x24a ,0x0 ,0xc0017900 ,0x24b ,0x0
@@ -450,7 +451,7 @@ static const uint32_t cached_cmd_gfx9[] = {0xc0016900 ,0x0 ,0x0 ,0xc0026900 ,0x3 ,0x2a ,0x0 ,0xc0046900 ,0xa ,0x0 ,0x0 ,0x0 ,0x200020 ,0xc0016900 ,0x83 ,0xffff ,0xc0026900 ,0x8e ,0xf ,0xf , -0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x12 , +0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x1a ,0xc0026900 ,0x10b ,0x0 ,0x0 ,0xc0016900 ,0x1e0 ,0x0 ,0xc0036900 ,0x200 ,0x0 ,0x10000 ,0xcc0011 , 0xc0026900, 0x292, 0x20, 0x60201b8,
@@ -2094,10 +2095,7 @@ static int amdgpu_dispatch_init(uint32_t *ptr, uint32_t ip_type) ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,3 ); ptr[i++] =0x204 ; i +=3 ; -/* clear mmCOMPUTE_RESOURCE_LIMITS */ - ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); - ptr[i++] =0x215 ; - ptr[i++] =0 ; +/* clear mmCOMPUTE_TMPRING_SIZE */ ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); ptr[i++] =0x218 ;
@@ -2184,6 +2182,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCLEAR );CU_ASSERT_EQUAL (r,0 );
@@ -2220,6 +2219,11 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x22222222 ; ptr_cmd[i++] =0x22222222 ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 ); ptr_cmd[i++] =0x10 ;
@@ -2321,6 +2325,7 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCOPY );CU_ASSERT_EQUAL (r,0 );
@@ -2365,6 +2370,11 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x400 ; ptr_cmd[i++] =0x74fac ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 ); ptr_cmd[i++] =0x10 ;
@@ -2438,6 +2448,8 @@ static void amdgpu_dispatch_test(void) r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_COMPUTE ,0 , &info);CU_ASSERT_EQUAL (r,0 ); +if (!info.available_rings) +printf ("SKIP ... as there's no compute ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_dispatch_test (device_handle,AMDGPU_HW_IP_COMPUTE , ring_id);
@@ -2446,6 +2458,8 @@ static void amdgpu_dispatch_test(void) 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 graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_dispatch_test (device_handle,AMDGPU_HW_IP_GFX , ring_id);
@@ -2901,12 +2915,14 @@ static void amdgpu_memset_draw_test(amdgpu_device_handle device_handle, &bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps, &va_shader_ps);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_ps,0 , bo_shader_size); r =amdgpu_bo_alloc_and_map (device_handle, bo_shader_size,4096 ,AMDGPU_GEM_DOMAIN_VRAM ,0 , &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs, &va_shader_vs);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_CONST );CU_ASSERT_EQUAL (r,0 );
@@ -2996,7 +3012,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x92 ; i +=3 ; - ptr_cmd[i++] =PACKET3 (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =PACKET3 (PACKET3_SET_CONTEXT_REG ,1 ); ptr_cmd[i++] =0x191 ; ptr_cmd[i++] =0 ;
@@ -3074,12 +3090,14 @@ static void amdgpu_memcpy_draw_test(amdgpu_device_handle device_handle, uint32_t &bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps, &va_shader_ps);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_ps,0 , bo_shader_size); r =amdgpu_bo_alloc_and_map (device_handle, bo_shader_size,4096 ,AMDGPU_GEM_DOMAIN_VRAM ,0 , &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs, &va_shader_vs);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_TEX );CU_ASSERT_EQUAL (r,0 );
@@ -3105,6 +3123,8 @@ static void amdgpu_draw_test(void) 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 graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_draw_test (device_handle, ring_id);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1563437433-4157-1-git-send-email-flora.cui-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 tests/amdgpu: add gpu reset test
1. perform gpu reset
2. perform dispatch test to verify gpu reset to a good state
--- tests/amdgpu/amdgpu_test.c | 5 +++++ tests/amdgpu/basic_tests.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
tests/amdgpu/amdgpu_test.c +5 -0
@@ -472,6 +472,11 @@ static void amdgpu_disable_suites()if (family_id <AMDGPU_FAMILY_AI || family_id >AMDGPU_FAMILY_RV )if (amdgpu_set_test_active (BASIC_TESTS_STR ,"Draw Test" ,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 (BASIC_TESTS_STR ,"GPU reset Test" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" ,CU_get_error_msg ()); }/* The main() function for setting up and running the tests.
tests/amdgpu/basic_tests.c +38 -0
@@ -24,6 +24,9 @@#include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #ifdef HAVE_ALLOCA_H # include <alloca.h> #endif
@@ -51,6 +54,7 @@ static void amdgpu_sync_dependency_test(void);static void amdgpu_bo_eviction_test (void );static void amdgpu_dispatch_test (void );static void amdgpu_draw_test (void ); +static void amdgpu_gpu_reset_test (void );static void amdgpu_command_submission_write_linear_helper (unsigned ip_type);static void amdgpu_command_submission_const_fill_helper (unsigned ip_type);
@@ -74,6 +78,7 @@ CU_TestInfo basic_tests[] = { { "Sync dependency Test", amdgpu_sync_dependency_test }, { "Dispatch Test", amdgpu_dispatch_test }, { "Draw Test", amdgpu_draw_test }, + { "GPU reset Test", amdgpu_gpu_reset_test }, CU_TEST_INFO_NULL, };#define BUFFER_SIZE (8 * 1024)
@@ -3131,3 +3136,36 @@ static void amdgpu_draw_test(void)amdgpu_memcpy_draw_test (device_handle, ring_id); } } + +static void amdgpu_gpu_reset_test (void ) +{ +int r; +char debugfs_path[256 ], tmp[10 ]; +int fd; +struct stat sbuf; +amdgpu_context_handle context_handle; +uint32_t hang_state, hangs; + + r =amdgpu_cs_ctx_create (device_handle, &context_handle); +CU_ASSERT_EQUAL (r,0 ); + + r =fstat (drm_amdgpu[0 ], &sbuf); +CU_ASSERT_EQUAL (r,0 ); + +sprintf (debugfs_path,"/sys/kernel/debug/dri/%d/amdgpu_gpu_recover" ,minor (sbuf.st_rdev)); + fd =open (debugfs_path,O_RDONLY ); +CU_ASSERT (fd >=0 ); + + r =read (fd, tmp,sizeof (tmp)/sizeof (char )); +CU_ASSERT (r >0 ); + + r =amdgpu_cs_query_reset_state (context_handle, &hang_state, &hangs); +CU_ASSERT_EQUAL (r,0 ); +CU_ASSERT_EQUAL (hang_state,AMDGPU_CTX_UNKNOWN_RESET ); + +close (fd); + r =amdgpu_cs_ctx_free (context_handle); +CU_ASSERT_EQUAL (r,0 ); + +amdgpu_dispatch_test (); +}
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1563437433-4157-2-git-send-email-flora.cui-5C7GfCeVMHo@public.gmane.org
Zhang, Hawking
Reviewed-by Hawking ZhangRE: [PATCH libdrm 2/2] tests/amdgpu: add gpu reset test
Series is:
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Cui, Flora
Sent: 2019年7月18日 16:11
To: [email protected]
Cc: Cui, Flora <[email protected]>
Subject: [PATCH libdrm 2/2] tests/amdgpu: add gpu reset test
1. perform gpu reset
2. perform dispatch test to verify gpu reset to a good state
--- tests/amdgpu/amdgpu_test.c | 5 +++++ tests/amdgpu/basic_tests.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
tests/amdgpu/amdgpu_test.c +6 -0
@@ -472,6 +472,11 @@ static void amdgpu_disable_suites()if (family_id <AMDGPU_FAMILY_AI || family_id >AMDGPU_FAMILY_RV )if (amdgpu_set_test_active (BASIC_TESTS_STR ,"Draw Test" ,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 (BASIC_TESTS_STR ,"GPU reset Test" ,CU_FALSE )) +fprintf (stderr,"test deactivation failed - %s\n" , +CU_get_error_msg ()); }
/* The main() function for setting up and running the tests.
tests/amdgpu/basic_tests.c +4 -0
@@ -24,6 +24,9 @@#include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #ifdef HAVE_ALLOCA_H # include <alloca.h> #endif
@@ -51,6 +54,7 @@ static void amdgpu_sync_dependency_test(void);static void amdgpu_bo_eviction_test (void );static void amdgpu_dispatch_test (void );static void amdgpu_draw_test (void ); +static void amdgpu_gpu_reset_test (void ); static void amdgpu_command_submission_write_linear_helper(unsigned ip_type); static void amdgpu_command_submission_const_fill_helper(unsigned ip_type); @@ -74,6 +78,7 @@ CU_TestInfo basic_tests[] = { {"Sync dependency Test" , amdgpu_sync_dependency_test }, {"Dispatch Test" , amdgpu_dispatch_test }, {"Draw Test" , amdgpu_draw_test },
+ { "GPU reset Test", amdgpu_gpu_reset_test },
CU_TEST_INFO_NULL,
};
#define BUFFER_SIZE (8 * 1024)
@@ -3131,3 +3136,36 @@ static void amdgpu_draw_test(void)
amdgpu_memcpy_draw_test(device_handle, ring_id);
}
}
+
+static void amdgpu_gpu_reset_test(void) {
+ int r;
+ char debugfs_path[256], tmp[10];
+ int fd;
+ struct stat sbuf;
+ amdgpu_context_handle context_handle;
+ uint32_t hang_state, hangs;
+
+ r = amdgpu_cs_ctx_create(device_handle, &context_handle);
+ CU_ASSERT_EQUAL(r, 0);
+
+ r = fstat(drm_amdgpu[0], &sbuf);
+ CU_ASSERT_EQUAL(r, 0);
+
+ sprintf(debugfs_path, "/sys/kernel/debug/dri/%d/amdgpu_gpu_recover", minor(sbuf.st_rdev));
+ fd = open(debugfs_path, O_RDONLY);
+ CU_ASSERT(fd >= 0);
+
+ r = read(fd, tmp, sizeof(tmp)/sizeof(char));
+ CU_ASSERT(r > 0);
+
+ r = amdgpu_cs_query_reset_state(context_handle, &hang_state, &hangs);
+ CU_ASSERT_EQUAL(r, 0);
+ CU_ASSERT_EQUAL(hang_state, AMDGPU_CTX_UNKNOWN_RESET);
+
+ close(fd);
+ r = amdgpu_cs_ctx_free(context_handle);
+ CU_ASSERT_EQUAL(r, 0);
+
+ amdgpu_dispatch_test();
+}
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 18.07.19 um 10:10 schrieb Cui, Flora:
Quoted 6 lines
1. skip test if there's no desired ring
2. clear shader buffer
3. update command buffer for gfx9Change-Id I5e4e92842c4fd1088c14dc048bedf4fe84892b36Signed-off-by Flora Cui <[email protected]>
Quoted 145 lines
--- tests/amdgpu/basic_tests.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)tests/amdgpu/basic_tests.c +26
-8@@ -329,14 +329,15 @@ static const uint32_t preamblecache_gfx9[] = {0xc0016900 ,0x2d5 ,0x10000 ,0xc0016900 ,0x2dc ,0x0 ,0xc0066900 ,0x2de ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0026900 ,0x2e5 ,0x0 ,0x0 ,0xc0056900 ,0x2f9 ,0x5 ,0x3f800000 ,0x3f800000 ,0x3f800000 ,0x3f800000 , -0xc0026900 ,0x311 ,0x3 ,0x0 ,0xc0026900 ,0x316 ,0x1e ,0x20 , +0xc0036900 ,0x311 ,0x3 ,0 ,0x100000 ,0xc0026900 ,0x316 ,0x1e ,0x20 ,0xc0016900 ,0x349 ,0x0 ,0xc0016900 ,0x358 ,0x0 ,0xc0016900 ,0x367 ,0x0 ,0xc0016900 ,0x376 ,0x0 ,0xc0016900 ,0x385 ,0x0 ,0xc0016900 ,0x19 ,0x0 ,0xc0056900 ,0xe8 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0076900 ,0x1e1 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0026900 ,0x204 ,0x90000 ,0x4 ,0xc0046900 ,0x20c ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0016900 ,0x2b2 ,0x0 ,0xc0026900 ,0x30e ,0xffffffff ,0xffffffff , -0xc0016900 ,0x314 ,0x0 ,0xc0002f00 ,0x1 ,0xc0016900 ,0x1 ,0x1 , +0xc0016900 ,0x314 ,0x0 ,0xc0016900 ,0x2a6 ,0 ,0xc0016900 ,0x210 ,0 , +0xc0002f00 ,0x1 ,0xc0016900 ,0x1 ,0x1 ,0xc0016900 ,0x18 ,0x2 ,0xc0016900 ,0x206 ,0x300 ,0xc0017900 ,0x20000243 ,0x0 ,0xc0017900 ,0x248 ,0xffffffff ,0xc0017900 ,0x249 ,0x0 ,0xc0017900 ,0x24a ,0x0 ,0xc0017900 ,0x24b ,0x0 @@ -450,7 +451,7 @@ static const uint32_t cached_cmd_gfx9[] = {0xc0016900 ,0x0 ,0x0 ,0xc0026900 ,0x3 ,0x2a ,0x0 ,0xc0046900 ,0xa ,0x0 ,0x0 ,0x0 ,0x200020 ,0xc0016900 ,0x83 ,0xffff ,0xc0026900 ,0x8e ,0xf ,0xf , -0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x12 , +0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x1a ,0xc0026900 ,0x10b ,0x0 ,0x0 ,0xc0016900 ,0x1e0 ,0x0 ,0xc0036900 ,0x200 ,0x0 ,0x10000 ,0xcc0011 , 0xc0026900, 0x292, 0x20, 0x60201b8,@@ -2094,10 +2095,7 @@ static int amdgpu_dispatch_init(uint32_t *ptr, uint32_t ip_type) ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,3 ); ptr[i++] =0x204 ; i +=3 ; -/* clear mmCOMPUTE_RESOURCE_LIMITS */ - ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); - ptr[i++] =0x215 ; - ptr[i++] =0 ; +/* clear mmCOMPUTE_TMPRING_SIZE */ ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); ptr[i++] =0x218 ;@@ -2184,6 +2182,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCLEAR );CU_ASSERT_EQUAL (r,0 );@@ -2220,6 +2219,11 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x22222222 ; ptr_cmd[i++] =0x22222222 ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 ); ptr_cmd[i++] =0x10 ;@@ -2321,6 +2325,7 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCOPY );CU_ASSERT_EQUAL (r,0 );@@ -2365,6 +2370,11 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x400 ; ptr_cmd[i++] =0x74fac ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 ); ptr_cmd[i++] =0x10 ;@@ -2438,6 +2448,8 @@ static void amdgpu_dispatch_test(void) r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_COMPUTE ,0 , &info);CU_ASSERT_EQUAL (r,0 ); +if (!info.available_rings) +printf ("SKIP ... as there's no compute ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_dispatch_test (device_handle,AMDGPU_HW_IP_COMPUTE , ring_id);@@ -2446,6 +2458,8 @@ static void amdgpu_dispatch_test(void) 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 graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_dispatch_test (device_handle,AMDGPU_HW_IP_GFX , ring_id);@@ -2901,12 +2915,14 @@ static void amdgpu_memset_draw_test(amdgpu_device_handle device_handle, &bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps, &va_shader_ps);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_ps,0 , bo_shader_size); r =amdgpu_bo_alloc_and_map (device_handle, bo_shader_size,4096 ,AMDGPU_GEM_DOMAIN_VRAM ,0 , &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs, &va_shader_vs);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_CONST );CU_ASSERT_EQUAL (r,0 );@@ -2996,7 +3012,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x92 ; i +=3 ; - ptr_cmd[i++] =PACKET3 (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =PACKET3 (PACKET3_SET_CONTEXT_REG ,1 ); ptr_cmd[i++] =0x191 ; ptr_cmd[i++] =0 ;@@ -3074,12 +3090,14 @@ static void amdgpu_memcpy_draw_test(amdgpu_device_handle device_handle, uint32_t &bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps, &va_shader_ps);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_ps,0 , bo_shader_size); r =amdgpu_bo_alloc_and_map (device_handle, bo_shader_size,4096 ,AMDGPU_GEM_DOMAIN_VRAM ,0 , &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs, &va_shader_vs);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_TEX );CU_ASSERT_EQUAL (r,0 );
tests/amdgpu/basic_tests.c static void amdgpu_draw_test(void) · line 3130
Quoted 8 lines
tests/amdgpu/basic_tests.c +2
-0@@ -3105,6 +3123,8 @@ static void amdgpu_draw_test(void) 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 graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_draw_test (device_handle, ring_id);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1c9de651-bbb2-6802-e729-182cab5ca427-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Hi Michel,
These 2 commits is pushed to https://gitlab.freedesktop.org/fcui/drm.
Could you help to merge to mesa/drm?
BR,
Flora
Quoted 162 lines · Christian König
Am 18.07.19 um 10:10 schrieb Cui, Flora:
Quoted 6 lines
1. skip test if there's no desired ring
2. clear shader buffer
3. update command buffer for gfx9Change-Id I5e4e92842c4fd1088c14dc048bedf4fe84892b36Signed-off-by Flora Cui <[email protected]>Acked-by Christian König <[email protected]>Quoted 152 lines
---
tests/amdgpu/basic_tests.c| 36 ++++++++++++++++++++++++++++--------1 file changed, 28 insertions(+), 8 deletions(-)tests/amdgpu/basic_tests.c +1
-1@@ -329,14 +329,15 @@ static const uint32_t preamblecache_gfx9[] = { 0xc0016900, 0x2d5, 0x10000, 0xc0016900, 0x2dc, 0x0, 0xc0066900, 0x2de, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc0026900,0x2e5 ,0x0 ,0x0 , 0xc0056900, 0x2f9, 0x5, 0x3f800000, 0x3f800000, 0x3f800000,0x3f800000 , - 0xc0026900, 0x311, 0x3, 0x0, 0xc0026900, 0x316, 0x1e, 0x20, + 0xc0036900, 0x311, 0x3, 0, 0x100000, 0xc0026900, 0x316, 0x1e, 0x20, 0xc0016900, 0x349, 0x0, 0xc0016900, 0x358, 0x0, 0xc0016900,0x367 ,0x0 , 0xc0016900, 0x376, 0x0, 0xc0016900, 0x385, 0x0, 0xc0016900,0x19 ,0x0 , 0xc0056900, 0xe8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc0076900, 0x1e1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc0026900, 0x204, 0x90000, 0x4, 0xc0046900, 0x20c, 0x0, 0x0, 0x0, 0x0,
0xc0016900,0x2b2,0x0,0xc0026900,0x30e,0xffffffff,0xffffffff, -0xc0016900,0x314,0x0,0xc0002f00,0x1,0xc0016900,0x1,0x1, +0xc0016900,0x314,0x0,0xc0016900,0x2a6, 0,0xc0016900,0x210, 0, +0xc0002f00,0x1,0xc0016900,0x1,0x1,
0xc0016900,0x18,0x2,0xc0016900,0x206,0x300,0xc0017900,0x20000243,0x0,
0xc0017900,0x248,0xffffffff,0xc0017900,0x249,0x0,0xc0017900,0x24a,0x0,
0xc0017900,0x24b,0x0tests/amdgpu/basic_tests.c +2
-5@@ -450,7 +451,7 @@ static const uint32_t cached_cmd_gfx9[] = { 0xc0016900, 0x0, 0x0, 0xc0026900, 0x3, 0x2a, 0x0, 0xc0046900, 0xa, 0x0, 0x0, 0x0, 0x200020, 0xc0016900, 0x83, 0xffff, 0xc0026900, 0x8e, 0xf, 0xf, - 0xc0056900, 0x105, 0x0, 0x0, 0x0, 0x0, 0x12, + 0xc0056900, 0x105, 0x0, 0x0, 0x0, 0x0, 0x1a, 0xc0026900, 0x10b, 0x0, 0x0, 0xc0016900, 0x1e0, 0x0, 0xc0036900, 0x200, 0x0, 0x10000, 0xcc0011, 0xc0026900, 0x292, 0x20, 0x60201b8,@@ -2094,10 +2095,7 @@ static int amdgpu_dispatch_init(uint32_t *ptr, uint32_t ip_type) ptr[i++] = PACKET3_COMPUTE(PKT3_SET_SH_REG, 3); ptr[i++] = 0x204; i += 3; - /* clear mmCOMPUTE_RESOURCE_LIMITS */ - ptr[i++] = PACKET3_COMPUTE(PKT3_SET_SH_REG, 1); - ptr[i++] = 0x215; - ptr[i++] = 0; + /* clear mmCOMPUTE_TMPRING_SIZE */ ptr[i++] = PACKET3_COMPUTE(PKT3_SET_SH_REG, 1);ptr[i++] =
0x218;tests/amdgpu/basic_tests.c +1
-0@@ -2184,6 +2182,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader); CU_ASSERT_EQUAL(r, 0); + memset(ptr_shader, 0, bo_shader_size); r = amdgpu_dispatch_load_cs_shader(ptr_shader, CS_BUFFERCLEAR); CU_ASSERT_EQUAL(r, 0);@@ -2220,6 +2219,11 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] = 0x22222222; ptr_cmd[i++] = 0x22222222;+ /* clear
mmCOMPUTE_RESOURCE_LIMITS*/
+ ptr_cmd[i++] =PACKET3_COMPUTE(PKT3_SET_SH_REG, 1); + ptr_cmd[i++] =0x215;
+ ptr_cmd[i++] = 0;
+
/* dispatch direct command */
ptr_cmd[i++] =PACKET3_COMPUTE(PACKET3_DISPATCH_DIRECT, 3); ptr_cmd[i++] =0x10;tests/amdgpu/basic_tests.c +1
-0@@ -2321,6 +2325,7 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader); CU_ASSERT_EQUAL(r, 0); + memset(ptr_shader, 0, bo_shader_size); r = amdgpu_dispatch_load_cs_shader(ptr_shader, CS_BUFFERCOPY ); CU_ASSERT_EQUAL(r, 0);@@ -2365,6 +2370,11 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] = 0x400; ptr_cmd[i++] = 0x74fac;+ /* clear
mmCOMPUTE_RESOURCE_LIMITS*/
+ ptr_cmd[i++] =PACKET3_COMPUTE(PKT3_SET_SH_REG, 1); + ptr_cmd[i++] =0x215;
+ ptr_cmd[i++] = 0;
+
/* dispatch direct command */
ptr_cmd[i++] =PACKET3_COMPUTE(PACKET3_DISPATCH_DIRECT, 3); ptr_cmd[i++] =0x10;tests/amdgpu/basic_tests.c +2
-0@@ -2438,6 +2448,8 @@ static void amdgpu_dispatch_test(void) r = amdgpu_query_hw_ip_info(device_handle,AMDGPU_HW_IP_COMPUTE ,0 , &info); CU_ASSERT_EQUAL(r, 0); + if (!info.available_rings) + printf("SKIP ... as there's no compute ring\n"); for (ring_id = 0; (1 << ring_id) & info.available_rings; ring_id++) { amdgpu_memset_dispatch_test(device_handle,
AMDGPU_HW_IP_COMPUTE,ring_id);tests/amdgpu/basic_tests.c +2
-0@@ -2446,6 +2458,8 @@ static void amdgpu_dispatch_test(void) 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 graphics ring\n"); for (ring_id = 0; (1 << ring_id) & info.available_rings; ring_id++) { amdgpu_memset_dispatch_test(device_handle,
AMDGPU_HW_IP_GFX,ring_id);tests/amdgpu/basic_tests.c +3
-0@@ -2901,12 +2915,14 @@ static void amdgpu_memset_draw_test(amdgpu_device_handle device_handle, &bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps, &va_shader_ps); CU_ASSERT_EQUAL(r, 0); + memset(ptr_shader_ps, 0, bo_shader_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size, 4096, AMDGPU_GEM_DOMAIN_VRAM, 0, &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs, &va_shader_vs); CU_ASSERT_EQUAL(r, 0); + memset(ptr_shader_vs, 0, bo_shader_size); r = amdgpu_draw_load_ps_shader(ptr_shader_ps, PS_CONST); CU_ASSERT_EQUAL(r, 0);@@ -2996,7 +3012,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, ptr_cmd[i++] = 0x92; i += 3; - ptr_cmd[i++] = PACKET3(PKT3_SET_SH_REG, 1); + ptr_cmd[i++] = PACKET3(PACKET3_SET_CONTEXT_REG, 1); ptr_cmd[i++] = 0x191; ptr_cmd[i++] = 0;@@ -3074,12 +3090,14 @@ static void amdgpu_memcpy_draw_test(amdgpu_device_handle
device_handle,uint32_t&bo_shader_ps,&ptr_shader_ps,&mc_address_shader_ps,&va_shader_ps);CU_ASSERT_EQUAL(r, 0);
+memset(ptr_shader_ps, 0, bo_shader_size);
r = amdgpu_bo_alloc_and_map(device_handle,bo_shader_size, 4096,AMDGPU_GEM_DOMAIN_VRAM, 0,&bo_shader_vs,&ptr_shader_vs,&mc_address_shader_vs,&va_shader_vs);CU_ASSERT_EQUAL(r, 0);
+memset(ptr_shader_vs, 0, bo_shader_size);
r =amdgpu_draw_load_ps_shader(ptr_shader_ps, PS_TEX);CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +0
-0@@ -3105,6 +3123,8 @@ static void amdgpu_draw_test(void)
Quoted 9 lines
tests/amdgpu/basic_tests.c static void amdgpu_draw_test(void) · line 3130
Quoted 8 lines
tests/amdgpu/basic_tests.c +2
-0r = 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 graphics ring\n"); for (ring_id = 0; (1 << ring_id) & info.available_rings; ring_id++) { amdgpu_memset_draw_test(device_handle, ring_id);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): febeaec7-db65-e18d-d073-d7e19f972edb-5C7GfCeVMHo@public.gmane.org
Quoted 4 lines · Flora
Hi Michel,
These 2 commits is pushed to https://gitlab.freedesktop.org/fcui/drm.
Could you help to merge to mesa/drm?
Please remove the Change-Id tags.
P.S. When a commit log lists multiple separate changes, it's a good indication that the change should be split up.
P.P.S. We'll need to figure out a better way to handle merging libdrm changes. My personal preference would be to enable GitLab merge requests for it.
Signature · 6 lines
Earthling Michel Dänzer | https://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 39c1c37e-89d8-bb00-2cc6-aa048aed77c8-otUistvHUpPR7s880joybQ@public.gmane.org
the Change-Id tags are added automatically. do you know how to get rid of it?
Quoted 8 lines · Michel Dänzer
Quoted 4 lines · Flora
Hi Michel,
These 2 commits is pushed to https://gitlab.freedesktop.org/fcui/drm.
Could you help to merge to mesa/drm?Please remove the Change-Id tags.
Quoted 7 lines
P.S. When a commit log lists multiple separate changes, it's a good indication that the change should be split up.
P.P.S. We'll need to figure out a better way to handle merging libdrm changes. My personal preference would be to enable GitLab merge requests for it.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 0a3b4a91-b679-6de3-f02c-5f5a6dfcb82d-5C7GfCeVMHo@public.gmane.org
Quoted 1 line · Flora
the Change-Id tags are added automatically. do you know how to get rid of it?
They're only magic to Gerrit, not to Git itself. You can remove them with any Git commit log editing tool, e.g.
git commit --amend
Signature · 6 lines
Earthling Michel Dänzer | https://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thanks Flora, can we have these tests, and try on our new APUs as well? 😊
Thanks,
Ray
Quoted 198 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Cui, Flora
Sent: Thursday, July 18, 2019 4:11 PM
To: [email protected]
Cc: Cui, Flora <[email protected]>
Subject: [PATCH libdrm 1/2] tests/amdgpu: fix for dispatch/draw test1. skip test if there's no desired ring
2. clear shader buffer
3. update command buffer for gfx9Change-Id I5e4e92842c4fd1088c14dc048bedf4fe84892b36Signed-off-by Flora Cui <[email protected]>--- tests/amdgpu/basic_tests.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)tests/amdgpu/basic_tests.c index renamed from tests/amdgpu/basic_tests.c +0
-02d47269..8fa7088 100644
tests/amdgpu/basic_tests.c +1
-1@@ -329,14 +329,15 @@ static const uint32_t preamblecache_gfx9[] = {0xc0016900 ,0x2d5 ,0x10000 ,0xc0016900 ,0x2dc ,0x0 ,0xc0066900 ,0x2de ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0026900 ,0x2e5 ,0x0 ,0x0 ,0xc0056900 ,0x2f9 ,0x5 ,0x3f800000 ,0x3f800000 ,0x3f800000 ,0x3f800000 , -0xc0026900 ,0x311 ,0x3 ,0x0 ,0xc0026900 ,0x316 ,0x1e ,0x20 , +0xc0036900 ,0x311 ,0x3 ,0 ,0x100000 ,0xc0026900 ,0x316 ,0x1e ,0x20 ,0xc0016900 ,0x349 ,0x0 ,0xc0016900 ,0x358 ,0x0 ,0xc0016900 ,0x367 ,0x0 ,0xc0016900 ,0x376 ,0x0 ,0xc0016900 ,0x385 ,0x0 ,0xc0016900 ,0x19 ,0x0 ,0xc0056900 ,0xe8 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0076900 ,0x1e1 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 , 0xc0026900, 0x204, 0x90000, 0x4, 0xc0046900, 0x20c, 0x0, 0x0, 0x0,
0x0,tests/amdgpu/basic_tests.c +1
-10xc0016900 ,0x2b2 ,0x0 ,0xc0026900 ,0x30e ,0xffffffff ,0xffffffff , - 0xc0016900, 0x314, 0x0, 0xc0002f00, 0x1, 0xc0016900, 0x1, 0x1, + 0xc0016900, 0x314, 0x0, 0xc0016900, 0x2a6, 0, 0xc0016900, 0x210,0,
tests/amdgpu/basic_tests.c +1
-0+0xc0002f00 ,0x1 ,0xc0016900 ,0x1 ,0x1 , 0xc0016900, 0x18, 0x2, 0xc0016900, 0x206, 0x300, 0xc0017900,
0x20000243,0x0,
0xc0017900,0x248,0xffffffff,0xc0017900,0x249,0x0,0xc0017900,0x24a,0x0,tests/amdgpu/basic_tests.c +2
-50xc0017900 ,0x24b ,0x0 @@ -450,7 +451,7 @@ static const uint32_t cached_cmd_gfx9[] = {0xc0016900 ,0x0 ,0x0 ,0xc0026900 ,0x3 ,0x2a ,0x0 ,0xc0046900 ,0xa ,0x0 ,0x0 ,0x0 ,0x200020 ,0xc0016900 ,0x83 ,0xffff ,0xc0026900 ,0x8e ,0xf ,0xf , -0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x12 , +0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x1a ,0xc0026900 ,0x10b ,0x0 ,0x0 ,0xc0016900 ,0x1e0 ,0x0 ,0xc0036900 ,0x200 ,0x0 ,0x10000 ,0xcc0011 , 0xc0026900, 0x292, 0x20, 0x60201b8,@@ -2094,10 +2095,7 @@ static int amdgpu_dispatch_init(uint32_t *ptr, uint32_t ip_type) ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,3 ); ptr[i++] =0x204 ; i +=3 ; -/* clear mmCOMPUTE_RESOURCE_LIMITS */ - ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); - ptr[i++] =0x215 ; - ptr[i++] =0 ; +/* clear mmCOMPUTE_TMPRING_SIZE */ ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 );tests/amdgpu/basic_tests.c +1
-0ptr[i++] =0x218 ;@@ -2184,6 +2182,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCLEAR );tests/amdgpu/basic_tests.c +5
-0CU_ASSERT_EQUAL (r,0 );@@ -2220,6 +2219,11 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x22222222 ; ptr_cmd[i++] =0x22222222 ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 );tests/amdgpu/basic_tests.c +1
-0ptr_cmd[i++] =0x10 ;@@ -2321,6 +2325,7 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCOPY );tests/amdgpu/basic_tests.c +5
-0CU_ASSERT_EQUAL (r,0 );@@ -2365,6 +2370,11 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x400 ; ptr_cmd[i++] =0x74fac ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 );tests/amdgpu/basic_tests.c +2
-0ptr_cmd[i++] =0x10 ;@@ -2438,6 +2448,8 @@ static void amdgpu_dispatch_test(void) r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_COMPUTE ,0 , &info);CU_ASSERT_EQUAL (r,0 ); +if (!info.available_rings) +printf ("SKIP ... as there's no compute ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_dispatch_test(device_handle,
AMDGPU_HW_IP_COMPUTE,ring_id); @@ -2446,6 +2458,8 @@ static voidamdgpu_dispatch_test(void)r = amdgpu_query_hw_ip_info(device_handle,
AMDGPU_HW_IP_GFX, 0, &info);tests/amdgpu/basic_tests.c +2
-0CU_ASSERT_EQUAL (r,0 ); +if (!info.available_rings) +printf ("SKIP ... as there's no graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { amdgpu_memset_dispatch_test(device_handle,
AMDGPU_HW_IP_GFX,ring_id); @@ -2901,12 +2915,14 @@ static void amdgpu_memset_draw_test(amdgpu_device_handledevice_handle,tests/amdgpu/basic_tests.c +0
-0&bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps,
&va_shader_ps);tests/amdgpu/basic_tests.c +1
-0CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_ps,0 , bo_shader_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size,4096,
tests/amdgpu/basic_tests.c +0
-0AMDGPU_GEM_DOMAIN_VRAM ,0 , &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs,
&va_shader_vs);tests/amdgpu/basic_tests.c +2
-1CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_CONST );CU_ASSERT_EQUAL (r,0 );@@ -2996,7 +3012,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x92 ; i +=3 ; - ptr_cmd[i++] =PACKET3 (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =PACKET3 (PACKET3_SET_CONTEXT_REG ,1 ); ptr_cmd[i++] =0x191 ; ptr_cmd[i++] =0 ;@@ -3074,12 +3090,14 @@ static void amdgpu_memcpy_draw_test(amdgpu_device_handle device_handle,
uint32_ttests/amdgpu/basic_tests.c +0
-0&bo_shader_ps, &ptr_shader_ps, &mc_address_shader_ps,
&va_shader_ps);tests/amdgpu/basic_tests.c +1
-0CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_ps,0 , bo_shader_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size,4096,
tests/amdgpu/basic_tests.c +0
-0AMDGPU_GEM_DOMAIN_VRAM ,0 , &bo_shader_vs, &ptr_shader_vs, &mc_address_shader_vs,
&va_shader_vs);tests/amdgpu/basic_tests.c +3
-0CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_TEX );CU_ASSERT_EQUAL (r,0 );@@ -3105,6 +3123,8 @@ static void amdgpu_draw_test(void) 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 graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {
amdgpu_memset_draw_test(device_handle, ring_id);
--
2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): MN2PR12MB3309C72D7A8B590F848B19FBECCB0-rweVpJHSKTpWdvXm18W95QdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
I'm not sure. Could you have a try?
Quoted 203 lines · Ray
Thanks Flora, can we have these tests, and try on our new APUs as well? 😊
Thanks,
RayQuoted 198 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Cui, Flora
Sent: Thursday, July 18, 2019 4:11 PM
To: [email protected]
Cc: Cui, Flora <[email protected]>
Subject: [PATCH libdrm 1/2] tests/amdgpu: fix for dispatch/draw test1. skip test if there's no desired ring
2. clear shader buffer
3. update command buffer for gfx9Change-Id I5e4e92842c4fd1088c14dc048bedf4fe84892b36Signed-off-by Flora Cui <[email protected]>--- tests/amdgpu/basic_tests.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)tests/amdgpu/basic_tests.c index renamed from tests/amdgpu/basic_tests.c +0
-02d47269..8fa7088 100644
tests/amdgpu/basic_tests.c +1
-1@@ -329,14 +329,15 @@ static const uint32_t preamblecache_gfx9[] = {0xc0016900 ,0x2d5 ,0x10000 ,0xc0016900 ,0x2dc ,0x0 ,0xc0066900 ,0x2de ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0026900 ,0x2e5 ,0x0 ,0x0 ,0xc0056900 ,0x2f9 ,0x5 ,0x3f800000 ,0x3f800000 ,0x3f800000 ,0x3f800000 , -0xc0026900 ,0x311 ,0x3 ,0x0 ,0xc0026900 ,0x316 ,0x1e ,0x20 , +0xc0036900 ,0x311 ,0x3 ,0 ,0x100000 ,0xc0026900 ,0x316 ,0x1e ,0x20 ,0xc0016900 ,0x349 ,0x0 ,0xc0016900 ,0x358 ,0x0 ,0xc0016900 ,0x367 ,0x0 ,0xc0016900 ,0x376 ,0x0 ,0xc0016900 ,0x385 ,0x0 ,0xc0016900 ,0x19 ,0x0 ,0xc0056900 ,0xe8 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0xc0076900 ,0x1e1 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 , 0xc0026900, 0x204, 0x90000, 0x4, 0xc0046900, 0x20c, 0x0, 0x0, 0x0,
0x0,
0xc0016900,0x2b2,0x0,0xc0026900,0x30e,0xffffffff,0xffffffff,tests/amdgpu/basic_tests.c +1
-1- 0xc0016900, 0x314, 0x0, 0xc0002f00, 0x1, 0xc0016900, 0x1, 0x1, + 0xc0016900, 0x314, 0x0, 0xc0016900, 0x2a6, 0, 0xc0016900, 0x210,0,
tests/amdgpu/basic_tests.c +1
-0+0xc0002f00 ,0x1 ,0xc0016900 ,0x1 ,0x1 , 0xc0016900, 0x18, 0x2, 0xc0016900, 0x206, 0x300, 0xc0017900,
0x20000243,0x0,
0xc0017900,0x248,0xffffffff,0xc0017900,0x249,0x0,0xc0017900,0x24a,0x0,
0xc0017900,0x24b,0x0tests/amdgpu/basic_tests.c +2
-5@@ -450,7 +451,7 @@ static const uint32_t cached_cmd_gfx9[] = {0xc0016900 ,0x0 ,0x0 ,0xc0026900 ,0x3 ,0x2a ,0x0 ,0xc0046900 ,0xa ,0x0 ,0x0 ,0x0 ,0x200020 ,0xc0016900 ,0x83 ,0xffff ,0xc0026900 ,0x8e ,0xf ,0xf , -0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x12 , +0xc0056900 ,0x105 ,0x0 ,0x0 ,0x0 ,0x0 ,0x1a ,0xc0026900 ,0x10b ,0x0 ,0x0 ,0xc0016900 ,0x1e0 ,0x0 ,0xc0036900 ,0x200 ,0x0 ,0x10000 ,0xcc0011 , 0xc0026900, 0x292, 0x20, 0x60201b8,@@ -2094,10 +2095,7 @@ static int amdgpu_dispatch_init(uint32_t *ptr, uint32_t ip_type) ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,3 ); ptr[i++] =0x204 ; i +=3 ; -/* clear mmCOMPUTE_RESOURCE_LIMITS */ - ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); - ptr[i++] =0x215 ; - ptr[i++] =0 ; +/* clear mmCOMPUTE_TMPRING_SIZE */ ptr[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 );ptr[i++] = 0x218;tests/amdgpu/basic_tests.c +1
-0@@ -2184,6 +2182,7 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCLEAR );CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +5
-0@@ -2220,6 +2219,11 @@ static void amdgpu_memset_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x22222222 ; ptr_cmd[i++] =0x22222222 ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 );ptr_cmd[i++] = 0x10;tests/amdgpu/basic_tests.c +1
-0@@ -2321,6 +2325,7 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, &bo_shader, &ptr_shader, &mc_address_shader, &va_shader);CU_ASSERT_EQUAL (r,0 ); +memset (ptr_shader,0 , bo_shader_size); r =amdgpu_dispatch_load_cs_shader (ptr_shader,CS_BUFFERCOPY );CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +5
-0@@ -2365,6 +2370,11 @@ static void amdgpu_memcpy_dispatch_test(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x400 ; ptr_cmd[i++] =0x74fac ; +/* clear mmCOMPUTE_RESOURCE_LIMITS */ + ptr_cmd[i++] =PACKET3_COMPUTE (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =0x215 ; + ptr_cmd[i++] =0 ; +/* dispatch direct command */ ptr_cmd[i++] =PACKET3_COMPUTE (PACKET3_DISPATCH_DIRECT ,3 );ptr_cmd[i++] = 0x10;tests/amdgpu/basic_tests.c +2
-0@@ -2438,6 +2448,8 @@ static void amdgpu_dispatch_test(void) r =amdgpu_query_hw_ip_info (device_handle,AMDGPU_HW_IP_COMPUTE ,0 , &info);CU_ASSERT_EQUAL (r,0 ); +if (!info.available_rings) +printf ("SKIP ... as there's no compute ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {amdgpu_memset_dispatch_test(device_handle,
AMDGPU_HW_IP_COMPUTE,ring_id); @@ -2446,6 +2458,8 @@ static voidamdgpu_dispatch_test(void)r = amdgpu_query_hw_ip_info(device_handle,
AMDGPU_HW_IP_GFX, 0, &info);
CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +2
-0+if (!info.available_rings) +printf ("SKIP ... as there's no graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) { amdgpu_memset_dispatch_test(device_handle,
AMDGPU_HW_IP_GFX,ring_id); @@ -2901,12 +2915,14 @@ static void amdgpu_memset_draw_test(amdgpu_device_handledevice_handle,
&bo_shader_ps,&ptr_shader_ps,&mc_address_shader_ps,&va_shader_ps);
CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +1
-0+memset (ptr_shader_ps,0 , bo_shader_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size,4096,
AMDGPU_GEM_DOMAIN_VRAM, 0,&bo_shader_vs,&ptr_shader_vs,&mc_address_shader_vs,&va_shader_vs);
CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +2
-1+memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_CONST );CU_ASSERT_EQUAL (r,0 );@@ -2996,7 +3012,7 @@ static void amdgpu_memcpy_draw(amdgpu_device_handle device_handle, ptr_cmd[i++] =0x92 ; i +=3 ; - ptr_cmd[i++] =PACKET3 (PKT3_SET_SH_REG ,1 ); + ptr_cmd[i++] =PACKET3 (PACKET3_SET_CONTEXT_REG ,1 ); ptr_cmd[i++] =0x191 ; ptr_cmd[i++] =0 ;@@ -3074,12 +3090,14 @@ static void amdgpu_memcpy_draw_test(amdgpu_device_handle device_handle,
uint32_t
&bo_shader_ps,&ptr_shader_ps,&mc_address_shader_ps,&va_shader_ps);
CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +1
-0+memset (ptr_shader_ps,0 , bo_shader_size); r = amdgpu_bo_alloc_and_map(device_handle, bo_shader_size,4096,
AMDGPU_GEM_DOMAIN_VRAM, 0,&bo_shader_vs,&ptr_shader_vs,&mc_address_shader_vs,&va_shader_vs);
CU_ASSERT_EQUAL(r, 0);tests/amdgpu/basic_tests.c +3
-0+memset (ptr_shader_vs,0 , bo_shader_size); r =amdgpu_draw_load_ps_shader (ptr_shader_ps,PS_TEX );CU_ASSERT_EQUAL (r,0 );@@ -3105,6 +3123,8 @@ static void amdgpu_draw_test(void) 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 graphics ring\n" );for (ring_id =0 ; (1 << ring_id) & info.available_rings; ring_id++) {
amdgpu_memset_draw_test(device_handle, ring_id);
--
2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx