Re: [PATCH i-g-t v3 1/2] tests/intel/xe_prefetch_fault: refactor test to accept shader function pointer

On 19-Aug-26 4:00 PM, Kamil Konieczny wrote:
> Hi Varun,
> On 2026-08-18 at 22:42:41 +0530, Varun Gupta wrote:
>> Parameterize test_prefetch_fault() to accept a shader getter function
>> pointer instead of hardcoding get_prefetch_shader(). This enables reuse
>> of the same test logic with different shader configurations (e.g., L2
>> prefetch fault shaders) without duplicating the test function.
>>
>> No functional change for existing subtests.
>>
>> Signed-off-by: Varun Gupta <[email protected]>
> Did you changed anything here from v1? If not, then r-b from
> Priyanka should be added. No need for sending series again, it
> could be applied at merge time.
>
> Regards,
> Kamil

Yes, there are no changes to patch 1 after v1, retaining Priyanka's RB
in that patch, and on 2nd patch will add Andrzej's RB.

Varun

>> ---
>>   tests/intel/xe_prefetch_fault.c | 23 +++++++++++++++--------
>>   1 file changed, 15 insertions(+), 8 deletions(-)
>>
>> diff --git a/tests/intel/xe_prefetch_fault.c b/tests/intel/xe_prefetch_fault.c
>> index d3b5aff47..e86cd68d9 100644
>> --- a/tests/intel/xe_prefetch_fault.c
>> +++ b/tests/intel/xe_prefetch_fault.c
>> @@ -117,9 +117,11 @@ static struct intel_bb *xe_bb_create_on_offset(int fd, uint32_t exec_queue, uint
>>   	return ibb;
>>   }
>>   
>> +typedef struct gpgpu_shader *(*get_shader_fn)(int fd);
>> +
>>   static struct gpgpu_shader *get_prefetch_shader(int fd)
>>   {
>> -	static struct gpgpu_shader *shader;
>> +	struct gpgpu_shader *shader;
>>   
>>   	shader = gpgpu_shader_create(fd);
>>   	gpgpu_shader__prefetch_fault(shader, xe_canonical_va(fd, PREFETCH_ADDR));
>> @@ -130,14 +132,17 @@ static struct gpgpu_shader *get_prefetch_shader(int fd)
>>   
>>   /**
>>    * SUBTEST: prefetch-fault
>> - * Description: Validate prefetch fault and hit-under-miss behavior
>> + * Description: Validate L1 prefetch fault and hit-under-miss behavior with
>> + *		L1 cached, L2 cached cache policy (fault source: LSC)
>>    * Run type: FULL
>>    *
>>    * SUBTEST: prefetch-fault-svm
>> - * Description: Validate prefetch fault and hit-under-miss behavior in SVM mode
>> + * Description: Validate L1 prefetch fault and hit-under-miss behavior in SVM
>> + *		mode with L1 cached, L2 cached cache policy (fault source: LSC)
>>    * Run type: FULL
>>    */
>> -static void test_prefetch_fault(int fd, struct drm_xe_engine_class_instance *hwe, bool svm)
>> +static void test_prefetch_fault(int fd, struct drm_xe_engine_class_instance *hwe,
>> +				bool svm, get_shader_fn get_shader)
>>   {
>>   	uint64_t bb_offset = BB_OFFSET;
>>   	/*
>> @@ -191,7 +196,7 @@ static void test_prefetch_fault(int fd, struct drm_xe_engine_class_instance *hwe
>>   	ibb = xe_bb_create_on_offset(fd, exec_queue_id, vm, bb_offset, bb_size);
>>   	intel_bb_set_lr_mode(ibb, true);
>>   
>> -	shader = get_prefetch_shader(fd);
>> +	shader = get_shader(fd);
>>   	gpgpu_shader_exec(ibb, buf, w_dim.x, w_dim.y, shader, NULL, 0, 0);
>>   	gpgpu_shader_destroy(shader);
>>   	intel_bb_sync(ibb);
>> @@ -225,7 +230,7 @@ static void test_prefetch_fault(int fd, struct drm_xe_engine_class_instance *hwe
>>   	ibb = xe_bb_create_on_offset(fd, exec_queue_id, vm, bb_offset2, bb_size);
>>   	intel_bb_set_lr_mode(ibb, true);
>>   
>> -	shader = get_prefetch_shader(fd);
>> +	shader = get_shader(fd);
>>   	gpgpu_shader_exec(ibb, buf, w_dim.x, w_dim.y, shader, NULL, 0, 0);
>>   	gpgpu_shader_destroy(shader);
>>   	intel_bb_sync(ibb);
>> @@ -271,7 +276,8 @@ int igt_main()
>>   			    hwe->engine_class == DRM_XE_ENGINE_CLASS_COMPUTE) {
>>   				igt_dynamic_f("%s%d", xe_engine_class_string(hwe->engine_class),
>>   					      hwe->engine_instance)
>> -					test_prefetch_fault(fd, hwe, false);
>> +					test_prefetch_fault(fd, hwe, false,
>> +							    get_prefetch_shader);
>>   			}
>>   		}
>>   	}
>> @@ -284,7 +290,8 @@ int igt_main()
>>   			    hwe->engine_class == DRM_XE_ENGINE_CLASS_COMPUTE) {
>>   				igt_dynamic_f("%s%d", xe_engine_class_string(hwe->engine_class),
>>   					      hwe->engine_instance)
>> -					test_prefetch_fault(fd, hwe, true);
>> +					test_prefetch_fault(fd, hwe, true,
>> +							    get_prefetch_shader);
>>   			}
>>   		}
>>   	}
>> -- 
>> 2.43.0
>>