From: Tvrtko Ursulin Subject: [PATCH i-g-t] tests/perf_pmu: Fix usage of for_each_engine_class_instance Date: Thu, 29 Mar 2018 10:11:28 +0100 Message-ID: <20180329091128.32341-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD6976E1E3 for ; Thu, 29 Mar 2018 09:11:42 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id v21so9543273wmc.1 for ; Thu, 29 Mar 2018 02:11:42 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldyb25nIGZp bGUgZGVzY3JpcHRvciB3YXMgcGFzc2VkIHRvIHRoZSBpdGVyYXRvci4gVGhpcyBoYWQgY3VycmVu dGx5IG5vCmVmZmVjdCwgc2luY2UgaXQgd2Fzbid0IHVzZWQgaW4gdGhlIG1hY3JvLCBidXQgbmVl ZHMgdG8gYmUgZml4ZWQuCgpBdCB0aGUgc2FtZSB0aW1lIG1ha2UgdGhlIG1hY3JvIGNvbnNpc3Rl bnQgYnkgY2hlY2tpbmcgZm9yIGVuZ2luZSBwcmVzZW5jZQpsaWtlIHRoZSBvdGhlciBpdGVyYXRv cnMgZG8uCgpBZGRlZCBfX2Zvcl9lYWNoX2VuZ2luZV9jbGFzc19pbnN0YW5jZSB3aGljaCBkb2Vz IG5vdCBjaGVjayBmb3IgZW5naW5lCnByZXNlbmNlIGFuZCBzbyBpcyB1c2VmdWwgZm9yIGVudW1l cmF0aW5nIGFsbCBwb3NzaWJsZSBlbmdpbmVzIC0gbGlrZSBmb3IKaW5zdGFuY2UgZm9yIHN1YnRl c3QgZW51bWVyYXRpb24uCgpBbmQgYW5vdGhlciAnd3JvbmcgZmQgdXNlZCcgZml4bGV0IGluIHRo ZSByZW5kZXIgbm9kZSBzdWJ0ZXN0cy4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0 dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJlcG9ydGVkLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWlj aGVsLnRoaWVycnlAaW50ZWwuY29tPgpDYzogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5 QGludGVsLmNvbT4KLS0tCiBsaWIvaWd0X2d0LmggICAgIHwgMTIgKysrKysrKy0tLS0tCiB0ZXN0 cy9wZXJmX3BtdS5jIHwgMzAgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVz IGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2xpYi9pZ3RfZ3QuaCBiL2xpYi9pZ3RfZ3QuaAppbmRleCBhNTE3ZWQ3YjI5YTAuLmQ0NGI3NTUy ZjNjNCAxMDA2NDQKLS0tIGEvbGliL2lndF9ndC5oCisrKyBiL2xpYi9pZ3RfZ3QuaApAQCAtMTAw LDExICsxMDAsNiBAQCBleHRlcm4gY29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUy IHsKIAlpbnQgaW5zdGFuY2U7CiB9IGludGVsX2V4ZWN1dGlvbl9lbmdpbmVzMltdOwogCi0jZGVm aW5lIGZvcl9lYWNoX2VuZ2luZV9jbGFzc19pbnN0YW5jZShmZF9fLCBlX18pIFwKLQlmb3IgKChl X18pID0gaW50ZWxfZXhlY3V0aW9uX2VuZ2luZXMyO1wKLQkgICAgIChlX18pLT5uYW1lOyBcCi0J ICAgICAoZV9fKSsrKQotCiB1bnNpZ25lZCBpbnQKIGdlbV9jbGFzc19pbnN0YW5jZV90b19lYl9m bGFncyhpbnQgZ2VtX2ZkLAogCQkJICAgICAgIGVudW0gZHJtX2k5MTVfZ2VtX2VuZ2luZV9jbGFz cyBjbGFzcywKQEAgLTEyMiw0ICsxMTcsMTEgQEAgdm9pZCBnZW1fcmVxdWlyZV9lbmdpbmUoaW50 IGdlbV9mZCwKIAlpZ3RfcmVxdWlyZShnZW1faGFzX2VuZ2luZShnZW1fZmQsIGNsYXNzLCBpbnN0 YW5jZSkpOwogfQogCisjZGVmaW5lIF9fZm9yX2VhY2hfZW5naW5lX2NsYXNzX2luc3RhbmNlKGZk X18sIGVfXykgXAorCWZvciAoKGVfXykgPSBpbnRlbF9leGVjdXRpb25fZW5naW5lczI7IChlX18p LT5uYW1lOyAoZV9fKSsrKQorCisjZGVmaW5lIGZvcl9lYWNoX2VuZ2luZV9jbGFzc19pbnN0YW5j ZShmZF9fLCBlX18pIFwKKwlmb3IgKChlX18pID0gaW50ZWxfZXhlY3V0aW9uX2VuZ2luZXMyOyAo ZV9fKS0+bmFtZTsgKGVfXykrKykgXAorCQlmb3JfaWYgKGdlbV9oYXNfZW5naW5lKChmZF9fKSwg KGVfXyktPmNsYXNzLCAoZV9fKS0+aW5zdGFuY2UpKQorCiAjZW5kaWYgLyogSUdUX0dUX0ggKi8K ZGlmZiAtLWdpdCBhL3Rlc3RzL3BlcmZfcG11LmMgYi90ZXN0cy9wZXJmX3BtdS5jCmluZGV4IGI1 OWFmODE4MTljNy4uMjI3M2RkYjllNjg0IDEwMDY0NAotLS0gYS90ZXN0cy9wZXJmX3BtdS5jCisr KyBiL3Rlc3RzL3BlcmZfcG11LmMKQEAgLTQzNCwxMCArNDM0LDggQEAgYnVzeV9jaGVja19hbGwo aW50IGdlbV9mZCwgY29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUyICplLAogCiAJ aSA9IDA7CiAJZmRbMF0gPSAtMTsKLQlmb3JfZWFjaF9lbmdpbmVfY2xhc3NfaW5zdGFuY2UoZmQs IGVfKSB7Ci0JCWlmICghZ2VtX2hhc19lbmdpbmUoZ2VtX2ZkLCBlXy0+Y2xhc3MsIGVfLT5pbnN0 YW5jZSkpCi0JCQljb250aW51ZTsKLQkJZWxzZSBpZiAoZSA9PSBlXykKKwlmb3JfZWFjaF9lbmdp bmVfY2xhc3NfaW5zdGFuY2UoZ2VtX2ZkLCBlXykgeworCQlpZiAoZSA9PSBlXykKIAkJCWJ1c3lf aWR4ID0gaTsKIAogCQlmZFtpKytdID0gb3Blbl9ncm91cChJOTE1X1BNVV9FTkdJTkVfQlVTWShl Xy0+Y2xhc3MsCkBAIC00OTksMTAgKzQ5Nyw3IEBAIG1vc3RfYnVzeV9jaGVja19hbGwoaW50IGdl bV9mZCwgY29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9lbmdpbmUyICplLAogCXVuc2lnbmVk IGludCBpZGxlX2lkeCwgaTsKIAogCWkgPSAwOwotCWZvcl9lYWNoX2VuZ2luZV9jbGFzc19pbnN0 YW5jZShmZCwgZV8pIHsKLQkJaWYgKCFnZW1faGFzX2VuZ2luZShnZW1fZmQsIGVfLT5jbGFzcywg ZV8tPmluc3RhbmNlKSkKLQkJCWNvbnRpbnVlOwotCisJZm9yX2VhY2hfZW5naW5lX2NsYXNzX2lu c3RhbmNlKGdlbV9mZCwgZV8pIHsKIAkJaWYgKGUgPT0gZV8pCiAJCQlpZGxlX2lkeCA9IGk7CiAJ CWVsc2UgaWYgKHNwaW4pCkBAIC01NTksMTAgKzU1NCw3IEBAIGFsbF9idXN5X2NoZWNrX2FsbChp bnQgZ2VtX2ZkLCBjb25zdCB1bnNpZ25lZCBpbnQgbnVtX2VuZ2luZXMsCiAJdW5zaWduZWQgaW50 IGk7CiAKIAlpID0gMDsKLQlmb3JfZWFjaF9lbmdpbmVfY2xhc3NfaW5zdGFuY2UoZmQsIGUpIHsK LQkJaWYgKCFnZW1faGFzX2VuZ2luZShnZW1fZmQsIGUtPmNsYXNzLCBlLT5pbnN0YW5jZSkpCi0J CQljb250aW51ZTsKLQorCWZvcl9lYWNoX2VuZ2luZV9jbGFzc19pbnN0YW5jZShnZW1fZmQsIGUp IHsKIAkJaWYgKHNwaW4pCiAJCQlfX3N1Ym1pdF9zcGluX2JhdGNoKGdlbV9mZCwgc3BpbiwgZSwg NjQpOwogCQllbHNlCkBAIC0xNjc3LDEwICsxNjY5LDggQEAgaWd0X21haW4KIAkJaWd0X3JlcXVp cmVfZ2VtKGZkKTsKIAkJaWd0X3JlcXVpcmUoaTkxNV90eXBlX2lkKCkgPiAwKTsKIAotCQlmb3Jf ZWFjaF9lbmdpbmVfY2xhc3NfaW5zdGFuY2UoZmQsIGUpIHsKLQkJCWlmIChnZW1faGFzX2VuZ2lu ZShmZCwgZS0+Y2xhc3MsIGUtPmluc3RhbmNlKSkKLQkJCQludW1fZW5naW5lcysrOwotCQl9CisJ CWZvcl9lYWNoX2VuZ2luZV9jbGFzc19pbnN0YW5jZShmZCwgZSkKKwkJCW51bV9lbmdpbmVzKys7 CiAJfQogCiAJLyoqCkBAIC0xNjg5LDcgKzE2NzksNyBAQCBpZ3RfbWFpbgogCWlndF9zdWJ0ZXN0 KCJpbnZhbGlkLWluaXQiKQogCQlpbnZhbGlkX2luaXQoKTsKIAotCWZvcl9lYWNoX2VuZ2luZV9j bGFzc19pbnN0YW5jZShmZCwgZSkgeworCV9fZm9yX2VhY2hfZW5naW5lX2NsYXNzX2luc3RhbmNl KGZkLCBlKSB7CiAJCWNvbnN0IHVuc2lnbmVkIGludCBwY3RbXSA9IHsgMiwgNTAsIDk4IH07CiAK IAkJLyoqCkBAIC0xODg4LDcgKzE4NzgsNyBAQCBpZ3RfbWFpbgogCQkJZ2VtX3F1aWVzY2VudF9n cHUoZmQpOwogCQl9CiAKLQkJZm9yX2VhY2hfZW5naW5lX2NsYXNzX2luc3RhbmNlKGZkLCBlKSB7 CisJCV9fZm9yX2VhY2hfZW5naW5lX2NsYXNzX2luc3RhbmNlKHJlbmRlcl9mZCwgZSkgewogCQkJ aWd0X3N1YnRlc3RfZ3JvdXAgewogCQkJCWlndF9maXh0dXJlIHsKIAkJCQkJZ2VtX3JlcXVpcmVf ZW5naW5lKHJlbmRlcl9mZCwKQEAgLTE4OTcsMTAgKzE4ODcsMTAgQEAgaWd0X21haW4KIAkJCQl9 CiAKIAkJCQlpZ3Rfc3VidGVzdF9mKCJyZW5kZXItbm9kZS1idXN5LSVzIiwgZS0+bmFtZSkKLQkJ CQkJc2luZ2xlKGZkLCBlLCBURVNUX0JVU1kpOworCQkJCQlzaW5nbGUocmVuZGVyX2ZkLCBlLCBU RVNUX0JVU1kpOwogCQkJCWlndF9zdWJ0ZXN0X2YoInJlbmRlci1ub2RlLWJ1c3ktaWRsZS0lcyIs CiAJCQkJCSAgICAgIGUtPm5hbWUpCi0JCQkJCXNpbmdsZShmZCwgZSwKKwkJCQkJc2luZ2xlKHJl bmRlcl9mZCwgZSwKIAkJCQkJICAgICAgIFRFU1RfQlVTWSB8IFRFU1RfVFJBSUxJTkdfSURMRSk7 CiAJCQl9CiAJCX0KLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==