From patchwork Thu Mar 12 11:15:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Landwerlin X-Patchwork-Id: 11433921 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DFF1B92C for ; Thu, 12 Mar 2020 11:15:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C8D1F206BE for ; Thu, 12 Mar 2020 11:15:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C8D1F206BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49C9C6E147; Thu, 12 Mar 2020 11:15:57 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7274F6E151 for ; Thu, 12 Mar 2020 11:15:55 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Mar 2020 04:15:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,544,1574150400"; d="scan'208";a="289685694" Received: from unknown (HELO delly.ger.corp.intel.com) ([10.252.53.213]) by FMSMGA003.fm.intel.com with ESMTP; 12 Mar 2020 04:15:51 -0700 From: Lionel Landwerlin To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Mar 2020 13:15:42 +0200 Message-Id: <20200312111542.2418545-3-lionel.g.landwerlin@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200312111542.2418545-1-lionel.g.landwerlin@intel.com> References: <20200312111542.2418545-1-lionel.g.landwerlin@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t v2 3/3] lib/i915/perf: update TGL configs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Some HW woes are forcing us to store EU activity counters in a different way. Signed-off-by: Lionel Landwerlin --- lib/i915/perf-configs/guids.xml | 41 +- lib/i915/perf-configs/oa-tgl.xml | 3577 ++++++++++++++++++++++-------- 2 files changed, 2718 insertions(+), 900 deletions(-) diff --git a/lib/i915/perf-configs/guids.xml b/lib/i915/perf-configs/guids.xml index d382d302..1e45cd1e 100644 --- a/lib/i915/perf-configs/guids.xml +++ b/lib/i915/perf-configs/guids.xml @@ -279,23 +279,30 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/i915/perf-configs/oa-tgl.xml b/lib/i915/perf-configs/oa-tgl.xml index 3f8ae3d1..4e4f453b 100644 --- a/lib/i915/perf-configs/oa-tgl.xml +++ b/lib/i915/perf-configs/oa-tgl.xml @@ -1,5 +1,5 @@ - + - - - - - - - - - - - - - + + + + + + @@ -746,34 +649,6 @@ mdapi_supported_apis="VK OGL OCL IO MEDIA" mdapi_hw_unit_type="gpu" /> - - - - - - - - + + + + + + @@ -1280,7 +1129,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 +1143,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 +1901,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,173 +1915,75 @@ 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 +2358,12 @@ - - - - - + + + + + + @@ -2743,7 +2514,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 +2528,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 +3127,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 +3141,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 +3465,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - - + + + - - + + + + + + @@ -4158,48 +3812,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - + + + - - + + + + + + @@ -4435,48 +4079,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - + + + - - + + + + + + @@ -4712,73 +4346,17 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - - + + + - - + + + + + + @@ -4989,48 +4613,6 @@ mdapi_supported_apis="" mdapi_hw_unit_type="gpu" /> - - - - + + + - - + + + + + + @@ -5352,7 +4966,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 +4980,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 +5405,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 +5419,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 +5846,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 +5860,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 +6445,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 +6459,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 +6980,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 +6994,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 +7456,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 +7470,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 +10213,7 @@