From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH igt 2/3] igt/perf_pmu: Stop peeking at intel_mmio registers Date: Thu, 23 Nov 2017 08:22:36 +0000 Message-ID: <20171123082237.9733-3-chris@chris-wilson.co.uk> References: <20171123082237.9733-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 494AA89CD9 for ; Thu, 23 Nov 2017 08:22:50 +0000 (UTC) In-Reply-To: <20171123082237.9733-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UHJvZ3JhbSB0aGUgTUlfV0FJVF9GT1JfRVZFTlQgd2l0aG91dCByZWZlcmVuY2UgdG8gREVSUk1S IGJ5IGtub3dpbmcgaXRzCnN0YXRlIGlzIH4wdSB3aGVuIG5vdCBpbiB1c2UsIGFuZCBpcyBvbmx5 IGluIHVzZSB3aGVuIHVzZXJzcGFjZSByZXF1aXJlcwppdC4gQnkgbm90IHRvdWNoaW5nIGludGVs X3JlZ3NpdGVyX2FjY2VzcyB3ZSBjb21wbGV0ZWx5IGVsaW1pbmF0ZSB0aGUKcmlzayB0aGF0IHdl IGxlYWsgdGhlIGZvcmNld2FrZSByZWYsIHdoaWNoIGNhbiBjYXVzZSBsYXRlciByYzYgdG8gZmFp bC4KCkF0IHRoZSBzYW1lIHRpbWUsIG5vdGUgdGhhdCB2bHYvY2h2IHVzZSBhIGRpZmZlcmVudCBt ZWNoYW5pc20gKHJlYWQKbm9uZSkgZm9yIGNvdXBsaW5nIGJldHdlZW4gdGhlIHJlbmRlciBlbmdp bmUgYW5kIGRpc3BsYXkuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KLS0tCiB0ZXN0cy9wZXJmX3BtdS5jIHwgNjMgKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzMiBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9w ZXJmX3BtdS5jIGIvdGVzdHMvcGVyZl9wbXUuYwppbmRleCA1MTE4YzAyMy4uN2ZkMTUwNmUgMTAw NjQ0Ci0tLSBhL3Rlc3RzL3BlcmZfcG11LmMKKysrIGIvdGVzdHMvcGVyZl9wbXUuYwpAQCAtNDk4 LDIwICs0OTgsMjIgQEAgZXZlbnRfd2FpdChpbnQgZ2VtX2ZkLCBjb25zdCBzdHJ1Y3QgaW50ZWxf ZXhlY3V0aW9uX2VuZ2luZTIgKmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVj dDIgb2JqID0geyB9OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgZWIgPSB7IH07 Ci0JZGF0YV90IGRhdGE7Ci0JaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZkYXRhLmRpc3BsYXk7 CiAJY29uc3QgdWludDMyX3QgREVSUk1SID0gMHg0NDA1MDsKKwljb25zdCB1aW50MzJfdCBGT1JD RVdBS0VfTVQgPSAweGExODg7CiAJdW5zaWduZWQgaW50IHZhbGlkX3Rlc3RzID0gMDsKLQl1aW50 MzJfdCBiYXRjaFs4XSwgKmI7CisJdWludDMyX3QgYmF0Y2hbMTZdLCAqYjsKKwl1aW50MTZfdCBk ZXZpZDsKIAlpZ3Rfb3V0cHV0X3QgKm91dHB1dDsKLQl1aW50MzJfdCBiYl9oYW5kbGU7Ci0JdWlu dDMyX3QgcmVnOworCWRhdGFfdCBkYXRhOwogCWVudW0gcGlwZSBwOwogCWludCBmZDsKIAotCWln dF9yZXF1aXJlKGludGVsX2dlbihpbnRlbF9nZXRfZHJtX2RldmlkKGdlbV9mZCkpID49IDYpOwot CWlndF9yZXF1aXJlKGludGVsX3JlZ2lzdGVyX2FjY2Vzc19pbml0KGludGVsX2dldF9wY2lfZGV2 aWNlKCksCi0JCQkJCSAgICAgICBmYWxzZSwgZ2VtX2ZkKSA9PSAwKTsKKwlkZXZpZCA9IGludGVs X2dldF9kcm1fZGV2aWQoZ2VtX2ZkKTsKKwlpZ3RfcmVxdWlyZShpbnRlbF9nZW4oZGV2aWQpID49 IDcpOworCWlndF9za2lwX29uKElTX1ZBTExFWVZJRVcoZGV2aWQpIHx8IElTX0NIRVJSWVZJRVco ZGV2aWQpKTsKKworCWttc3Rlc3Rfc2V0X3Z0X2dyYXBoaWNzX21vZGUoKTsKKwlpZ3RfZGlzcGxh eV9pbml0KCZkYXRhLmRpc3BsYXksIGdlbV9mZCk7CiAKIAkvKioKIAkgKiBXZSB3aWxsIHVzZSB0 aGUgZGlzcGxheSB0byByZW5kZXIgZXZlbnQgZm9yd2FyaW5kIHNvIG5lZWQgdG8KQEAgLTUyMiw1 MSArNTI0LDUyIEBAIGV2ZW50X3dhaXQoaW50IGdlbV9mZCwgY29uc3Qgc3RydWN0IGludGVsX2V4 ZWN1dGlvbl9lbmdpbmUyICplKQogCSAqIGxpc3RlbiB0byB0aGUgcmVjb3JkZWQgdGltZSBzcGVu dCBpbiBlbmdpbmUgd2FpdCBzdGF0ZSBhcyByZXBvcnRlZAogCSAqIGJ5IHRoZSBQTVUuCiAJICov Ci0JcmVnID0gaW50ZWxfcmVnaXN0ZXJfcmVhZChERVJSTVIpOwotCi0Ja21zdGVzdF9zZXRfdnRf Z3JhcGhpY3NfbW9kZSgpOwotCWlndF9kaXNwbGF5X2luaXQoJmRhdGEuZGlzcGxheSwgZ2VtX2Zk KTsKLQotCWJiX2hhbmRsZSA9IGdlbV9jcmVhdGUoZ2VtX2ZkLCA0MDk2KTsKKwlvYmouaGFuZGxl ID0gZ2VtX2NyZWF0ZShnZW1fZmQsIDQwOTYpOwogCiAJYiA9IGJhdGNoOwogCSpiKysgPSBNSV9M T0FEX1JFR0lTVEVSX0lNTTsKKwkqYisrID0gRk9SQ0VXQUtFX01UOworCSpiKysgPSAyIDw8IDE2 IHwgMjsKKwkqYisrID0gTUlfTE9BRF9SRUdJU1RFUl9JTU07CiAJKmIrKyA9IERFUlJNUjsKLQkq YisrID0gcmVnICYgfigoMSA8PCAzKSB8ICgxIDw8IDExKSB8ICgxIDw8IDIxKSk7Ci0JKmIrKyA9 IE1JX1dBSVRfRk9SX0VWRU5UIHwgTUlfV0FJVF9GT1JfUElQRV9BX1ZCTEFOSzsKKwkqYisrID0g fjB1OworCSpiKysgPSBNSV9XQUlUX0ZPUl9FVkVOVDsKIAkqYisrID0gTUlfTE9BRF9SRUdJU1RF Ul9JTU07CiAJKmIrKyA9IERFUlJNUjsKLQkqYisrID0gcmVnOworCSpiKysgPSB+MHU7CisJKmIr KyA9IE1JX0xPQURfUkVHSVNURVJfSU1NOworCSpiKysgPSBGT1JDRVdBS0VfTVQ7CisJKmIrKyA9 IDIgPDwgMTY7CiAJKmIrKyA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7CiAKLQlvYmouaGFuZGxlID0g YmJfaGFuZGxlOwotCiAJZWIuYnVmZmVyX2NvdW50ID0gMTsKIAllYi5idWZmZXJzX3B0ciA9IHRv X3VzZXJfcG9pbnRlcigmb2JqKTsKIAllYi5mbGFncyA9IGUycmluZyhnZW1fZmQsIGUpIHwgSTkx NV9FWEVDX1NFQ1VSRTsKIAotCWZvcl9lYWNoX3BpcGVfd2l0aF92YWxpZF9vdXRwdXQoZGlzcGxh eSwgcCwgb3V0cHV0KSB7CisJZm9yX2VhY2hfcGlwZV93aXRoX3ZhbGlkX291dHB1dCgmZGF0YS5k aXNwbGF5LCBwLCBvdXRwdXQpIHsKIAkJc3RydWN0IGlndF9oZWxwZXJfcHJvY2VzcyB3YWl0ZXIg PSB7IH07CiAJCWNvbnN0IHVuc2lnbmVkIGludCBmcmFtZXMgPSAzOwotCQl1bnNpZ25lZCBpbnQg ZnJhbWU7CiAJCXVpbnQ2NF90IHZhbFsyXTsKIAotCQliYXRjaFszXSA9IE1JX1dBSVRfRk9SX0VW RU5UOworCQliYXRjaFs2XSA9IE1JX1dBSVRfRk9SX0VWRU5UOwogCQlzd2l0Y2ggKHApIHsKIAkJ Y2FzZSBQSVBFX0E6Ci0JCQliYXRjaFszXSB8PSBNSV9XQUlUX0ZPUl9QSVBFX0FfVkJMQU5LOwor CQkJYmF0Y2hbNl0gfD0gTUlfV0FJVF9GT1JfUElQRV9BX1ZCTEFOSzsKKwkJCWJhdGNoWzVdID0g figxIDw8IDMpOwogCQkJYnJlYWs7CiAJCWNhc2UgUElQRV9COgotCQkJYmF0Y2hbM10gfD0gTUlf V0FJVF9GT1JfUElQRV9CX1ZCTEFOSzsKKwkJCWJhdGNoWzZdIHw9IE1JX1dBSVRfRk9SX1BJUEVf Ql9WQkxBTks7CisJCQliYXRjaFs1XSA9IH4oMSA8PCAxMSk7CiAJCQlicmVhazsKIAkJY2FzZSBQ SVBFX0M6Ci0JCQliYXRjaFszXSB8PSBNSV9XQUlUX0ZPUl9QSVBFX0NfVkJMQU5LOworCQkJYmF0 Y2hbNl0gfD0gTUlfV0FJVF9GT1JfUElQRV9DX1ZCTEFOSzsKKwkJCWJhdGNoWzVdID0gfigxIDw8 IDIxKTsKIAkJCWJyZWFrOwogCQlkZWZhdWx0OgogCQkJY29udGludWU7CiAJCX0KIAotCQlnZW1f d3JpdGUoZ2VtX2ZkLCBiYl9oYW5kbGUsIDAsIGJhdGNoLCBzaXplb2YoYmF0Y2gpKTsKKwkJZ2Vt X3dyaXRlKGdlbV9mZCwgb2JqLmhhbmRsZSwgMCwgYmF0Y2gsIHNpemVvZihiYXRjaCkpOwogCiAJ CWRhdGEucGlwZSA9IHA7CiAJCXByZXBhcmVfY3J0YygmZGF0YSwgZ2VtX2ZkLCBvdXRwdXQpOwpA QCAtNTg5LDkgKzU5Miw5IEBAIGV2ZW50X3dhaXQoaW50IGdlbV9mZCwgY29uc3Qgc3RydWN0IGlu dGVsX2V4ZWN1dGlvbl9lbmdpbmUyICplKQogCQkJfQogCQl9CiAKLQkJZm9yIChmcmFtZSA9IDA7 IGZyYW1lIDwgZnJhbWVzOyBmcmFtZSsrKSB7CisJCWZvciAodW5zaWduZWQgaW50IGZyYW1lID0g MDsgZnJhbWUgPCBmcmFtZXM7IGZyYW1lKyspIHsKIAkJCWdlbV9leGVjYnVmKGdlbV9mZCwgJmVi KTsKLQkJCWdlbV9zeW5jKGdlbV9mZCwgYmJfaGFuZGxlKTsKKwkJCWdlbV9zeW5jKGdlbV9mZCwg b2JqLmhhbmRsZSk7CiAJCX0KIAogCQlpZ3Rfc3RvcF9oZWxwZXIoJndhaXRlcik7CkBAIC02MDYs OSArNjA5LDcgQEAgZXZlbnRfd2FpdChpbnQgZ2VtX2ZkLCBjb25zdCBzdHJ1Y3QgaW50ZWxfZXhl Y3V0aW9uX2VuZ2luZTIgKmUpCiAJCWlndF9hc3NlcnQodmFsWzFdIC0gdmFsWzBdID4gMCk7CiAJ fQogCi0JZ2VtX2Nsb3NlKGdlbV9mZCwgYmJfaGFuZGxlKTsKLQotCWludGVsX3JlZ2lzdGVyX2Fj Y2Vzc19maW5pKCk7CisJZ2VtX2Nsb3NlKGdlbV9mZCwgb2JqLmhhbmRsZSk7CiAKIAlpZ3RfcmVx dWlyZV9mKHZhbGlkX3Rlc3RzLAogCQkgICAgICAibm8gdmFsaWQgY3J0Yy9jb25uZWN0b3IgY29t YmluYXRpb25zIGZvdW5kXG4iKTsKLS0gCjIuMTUuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==