From 13c0be2fe8669fef08c0d1c44b147c43d1f53d2b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 12 Mar 2020 12:39:45 +0200 Subject: lib/i915/perf: update TGL configs Some HW woes are forcing us to store EU activity counters in a different way. Signed-off-by: Lionel Landwerlin Acked-by: Umesh Nerlige Ramappa --- lib/i915/perf-configs/guids.xml | 42 +- lib/i915/perf-configs/oa-tgl.xml | 3922 +++++++++++++++++++++++++++++--------- 2 files changed, 3055 insertions(+), 909 deletions(-) (limited to 'lib') diff --git a/lib/i915/perf-configs/guids.xml b/lib/i915/perf-configs/guids.xml index d382d302..76ad2b0f 100644 --- a/lib/i915/perf-configs/guids.xml +++ b/lib/i915/perf-configs/guids.xml @@ -279,23 +279,31 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/i915/perf-configs/oa-tgl.xml b/lib/i915/perf-configs/oa-tgl.xml index 3f8ae3d1..1c6ee712 100644 --- a/lib/i915/perf-configs/oa-tgl.xml +++ b/lib/i915/perf-configs/oa-tgl.xml @@ -1,5 +1,5 @@ - + - - - - - - - - - - - - - + + + + + + @@ -612,7 +515,7 @@ symbol_name="ComputeBasic" underscore_name="compute_basic" mdapi_supported_apis="VK OGL OCL IO" - hw_config_guid="6ad92fc0-ed62-460c-b774-5353534c67ed" + hw_config_guid="e6bdd317-fe1c-406a-afc7-781e88f57bd7" > - - - - - - - - - + + + + + + @@ -1280,7 +1115,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -1294,7 +1129,21 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + mdapi_group="EU Array" + mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" + mdapi_supported_apis="" + mdapi_hw_unit_type="gpu" + /> + - + + + + + + @@ -2033,7 +1887,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -2047,160 +1901,62 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - - - - - - - - @@ -2588,11 +2344,12 @@ - - - - - + + + + + + @@ -2743,7 +2500,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -2757,124 +2514,26 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - - - - - - - - - - + + + + + + @@ -3453,7 +3113,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -3467,26 +3127,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + @@ -3801,48 +3451,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - - + + + - - + + + + + + @@ -4158,48 +3798,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - + + + - - + + + + + + @@ -4435,48 +4065,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - + + + - - + + + + + + @@ -4712,73 +4332,17 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - - + + + - - + + + + + + @@ -4989,48 +4599,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - + + + - - + + + + + + @@ -5352,7 +4952,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -5366,26 +4966,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + @@ -5801,7 +5391,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -5815,26 +5405,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + @@ -6252,7 +5832,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -6266,26 +5846,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + @@ -6861,7 +6431,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -6875,26 +6445,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + @@ -7406,7 +6966,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -7420,26 +6980,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + @@ -7892,7 +7442,7 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 7 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 7 READ A 8 READ FADD A 9 READ FADD A 10 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" @@ -7906,26 +7456,12 @@ max_equation="100" units="percent" semantic_type="duration" - equation="A 8 READ $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" + equation="A 11 READ A 12 READ FADD A 13 READ FADD A 14 READ FADD $EuCoresTotalCount UDIV 100 UMUL $GpuCoreClocks FDIV" mdapi_group="EU Array" mdapi_usage_flags="Tier2 Overview System Frame Batch Draw" mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8402,7 +10540,7 @@