From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8282C890F2 for ; Wed, 5 Jun 2019 12:38:22 +0000 (UTC) From: Petri Latvala Date: Wed, 5 Jun 2019 15:38:15 +0300 Message-Id: <20190605123815.28529-1-petri.latvala@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] perf_pmu: Remove redundant check for engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Petri Latvala , Tvrtko Ursulin List-ID: X19mb3JfZWFjaF9waHlzaWNhbF9lbmdpbmUgYWxyZWFkeSBpdGVyYXRlcyBvdmVyIG9ubHkgZW5n aW5lcyB0aGF0CmV4aXN0LCB3ZSBkb24ndCBuZWVkIHRvIGNoZWNrIGFnYWluIHRoYXQgdGhleSBl eGlzdC4KClJlbW92aW5nIHRoZSBjaGVjayBhbHNvIG1ha2VzIHRoZWlyIHJlc3BlY3RpdmUgc3Vi dGVzdF9ncm91cHMgbm90Cm5lZWRlZC4KClNpZ25lZC1vZmYtYnk6IFBldHJpIExhdHZhbGEgPHBl dHJpLmxhdHZhbGFAaW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KQ2M6IEFuZGkgU2h5dGkgPGFuZGkuc2h5dGlAaW50ZWwuY29tPgotLS0KIHRl c3RzL3BlcmZfcG11LmMgfCAyMjMgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMDUgaW5zZXJ0aW9ucygrKSwgMTE4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL3BlcmZfcG11LmMgYi90ZXN0cy9wZXJmX3BtdS5j CmluZGV4IDcyYjkxNjZhLi5kMzkyYTY3ZCAxMDA2NDQKLS0tIGEvdGVzdHMvcGVyZl9wbXUuYwor KysgYi90ZXN0cy9wZXJmX3BtdS5jCkBAIC0xNzEyLDExNiArMTcxMiwxMTAgQEAgaWd0X21haW4K IAkJaWd0X3N1YnRlc3RfZigiaW5pdC1zZW1hLSVzIiwgZS0+bmFtZSkKIAkJCWluaXQoZmQsIGUs IEk5MTVfU0FNUExFX1NFTUEpOwogCi0JCWlndF9zdWJ0ZXN0X2dyb3VwIHsKLQkJCWlndF9maXh0 dXJlIHsKLQkJCQlnZW1fY29udGV4dF9oYXNfZW5naW5lKGZkLCAwLCBlLT5mbGFncyk7Ci0JCQl9 CisJCS8qKgorCQkgKiBUZXN0IHRoYXQgZW5naW5lcyBzaG93IG5vIGxvYWQgd2hlbiBpZGxlLgor CQkgKi8KKwkJaWd0X3N1YnRlc3RfZigiaWRsZS0lcyIsIGUtPm5hbWUpCisJCQlzaW5nbGUoZmQs IGUsIDApOwogCi0JCQkvKioKLQkJCSAqIFRlc3QgdGhhdCBlbmdpbmVzIHNob3cgbm8gbG9hZCB3 aGVuIGlkbGUuCi0JCQkgKi8KLQkJCWlndF9zdWJ0ZXN0X2YoImlkbGUtJXMiLCBlLT5uYW1lKQot CQkJCXNpbmdsZShmZCwgZSwgMCk7Ci0KLQkJCS8qKgotCQkJICogVGVzdCB0aGF0IGEgc2luZ2xl IGVuZ2luZSByZXBvcnRzIGxvYWQgY29ycmVjdGx5LgotCQkJICovCi0JCQlpZ3Rfc3VidGVzdF9m KCJidXN5LSVzIiwgZS0+bmFtZSkKLQkJCQlzaW5nbGUoZmQsIGUsIFRFU1RfQlVTWSk7Ci0JCQlp Z3Rfc3VidGVzdF9mKCJidXN5LWlkbGUtJXMiLCBlLT5uYW1lKQotCQkJCXNpbmdsZShmZCwgZSwg VEVTVF9CVVNZIHwgVEVTVF9UUkFJTElOR19JRExFKTsKLQotCQkJLyoqCi0JCQkgKiBUZXN0IHRo YXQgd2hlbiBvbmUgZW5naW5lIGlzIGxvYWRlZCBvdGhlciByZXBvcnQgbm8KLQkJCSAqIGxvYWQu Ci0JCQkgKi8KLQkJCWlndF9zdWJ0ZXN0X2YoImJ1c3ktY2hlY2stYWxsLSVzIiwgZS0+bmFtZSkK LQkJCQlidXN5X2NoZWNrX2FsbChmZCwgZSwgbnVtX2VuZ2luZXMsIFRFU1RfQlVTWSk7Ci0JCQlp Z3Rfc3VidGVzdF9mKCJidXN5LWlkbGUtY2hlY2stYWxsLSVzIiwgZS0+bmFtZSkKLQkJCQlidXN5 X2NoZWNrX2FsbChmZCwgZSwgbnVtX2VuZ2luZXMsCi0JCQkJCSAgICAgICBURVNUX0JVU1kgfCBU RVNUX1RSQUlMSU5HX0lETEUpOwotCi0JCQkvKioKLQkJCSAqIFRlc3QgdGhhdCB3aGVuIGFsbCBl eGNlcHQgb25lIGVuZ2luZSBhcmUgbG9hZGVkIGFsbAotCQkJICogbG9hZHMgYXJlIGNvcnJlY3Rs eSByZXBvcnRlZC4KLQkJCSAqLwotCQkJaWd0X3N1YnRlc3RfZigibW9zdC1idXN5LWNoZWNrLWFs bC0lcyIsIGUtPm5hbWUpCi0JCQkJbW9zdF9idXN5X2NoZWNrX2FsbChmZCwgZSwgbnVtX2VuZ2lu ZXMsCi0JCQkJCQkgICAgVEVTVF9CVVNZKTsKLQkJCWlndF9zdWJ0ZXN0X2YoIm1vc3QtYnVzeS1p ZGxlLWNoZWNrLWFsbC0lcyIsIGUtPm5hbWUpCi0JCQkJbW9zdF9idXN5X2NoZWNrX2FsbChmZCwg ZSwgbnVtX2VuZ2luZXMsCi0JCQkJCQkgICAgVEVTVF9CVVNZIHwKLQkJCQkJCSAgICBURVNUX1RS QUlMSU5HX0lETEUpOwotCi0JCQkvKioKLQkJCSAqIFRlc3QgdGhhdCBzZW1waG9yZSBjb3VudGVy cyByZXBvcnQgbm8gYWN0aXZpdHkgb24KLQkJCSAqIGlkbGUgb3IgYnVzeSBlbmdpbmVzLgotCQkJ ICovCi0JCQlpZ3Rfc3VidGVzdF9mKCJpZGxlLW5vLXNlbWFwaG9yZXMtJXMiLCBlLT5uYW1lKQot CQkJCW5vX3NlbWEoZmQsIGUsIDApOwotCi0JCQlpZ3Rfc3VidGVzdF9mKCJidXN5LW5vLXNlbWFw aG9yZXMtJXMiLCBlLT5uYW1lKQotCQkJCW5vX3NlbWEoZmQsIGUsIFRFU1RfQlVTWSk7Ci0KLQkJ CWlndF9zdWJ0ZXN0X2YoImJ1c3ktaWRsZS1uby1zZW1hcGhvcmVzLSVzIiwgZS0+bmFtZSkKLQkJ CQlub19zZW1hKGZkLCBlLCBURVNUX0JVU1kgfCBURVNUX1RSQUlMSU5HX0lETEUpOwotCi0JCQkv KioKLQkJCSAqIFRlc3QgdGhhdCBzZW1hcGhvcmUgd2FpdHMgYXJlIGNvcnJlY3RseSByZXBvcnRl ZC4KLQkJCSAqLwotCQkJaWd0X3N1YnRlc3RfZigic2VtYXBob3JlLXdhaXQtJXMiLCBlLT5uYW1l KQotCQkJCXNlbWFfd2FpdChmZCwgZSwgVEVTVF9CVVNZKTsKLQotCQkJaWd0X3N1YnRlc3RfZigi c2VtYXBob3JlLXdhaXQtaWRsZS0lcyIsIGUtPm5hbWUpCi0JCQkJc2VtYV93YWl0KGZkLCBlLAot CQkJCQkgIFRFU1RfQlVTWSB8IFRFU1RfVFJBSUxJTkdfSURMRSk7Ci0KLQkJCS8qKgotCQkJICog Q2hlY2sgdGhhdCB0d28gcGVyZiBjbGllbnRzIGRvIG5vdCBpbmZsdWVuY2UgZWFjaAotCQkJICog b3RoZXJzIG9ic2VydmF0aW9ucy4KLQkJCSAqLwotCQkJaWd0X3N1YnRlc3RfZigibXVsdGktY2xp ZW50LSVzIiwgZS0+bmFtZSkKLQkJCQltdWx0aV9jbGllbnQoZmQsIGUpOwotCi0JCQkvKioKLQkJ CSogQ2hlY2sgdGhhdCByZXBvcnRlZCB1c2FnZSBpcyBjb3JyZWN0IHdoZW4gUE1VIGlzCi0JCQkq IGVuYWJsZWQgYWZ0ZXIgdGhlIGJhdGNoIGlzIHJ1bm5pbmcuCi0JCQkqLwotCQkJaWd0X3N1YnRl c3RfZigiYnVzeS1zdGFydC0lcyIsIGUtPm5hbWUpCi0JCQkJYnVzeV9zdGFydChmZCwgZSk7Ci0K LQkJCS8qKgotCQkJICogQ2hlY2sgdGhhdCByZXBvcnRlZCB1c2FnZSBpcyBjb3JyZWN0IHdoZW4g UE1VIGlzCi0JCQkgKiBlbmFibGVkIGFmdGVyIHR3byBiYXRjaGVzIGFyZSBydW5uaW5nLgotCQkJ ICovCi0JCQlpZ3Rfc3VidGVzdF9mKCJidXN5LWRvdWJsZS1zdGFydC0lcyIsIGUtPm5hbWUpIHsK LQkJCQlnZW1fcmVxdWlyZV9jb250ZXh0cyhmZCk7Ci0JCQkJYnVzeV9kb3VibGVfc3RhcnQoZmQs IGUpOwotCQkJfQorCQkvKioKKwkJICogVGVzdCB0aGF0IGEgc2luZ2xlIGVuZ2luZSByZXBvcnRz IGxvYWQgY29ycmVjdGx5LgorCQkgKi8KKwkJaWd0X3N1YnRlc3RfZigiYnVzeS0lcyIsIGUtPm5h bWUpCisJCQlzaW5nbGUoZmQsIGUsIFRFU1RfQlVTWSk7CisJCWlndF9zdWJ0ZXN0X2YoImJ1c3kt aWRsZS0lcyIsIGUtPm5hbWUpCisJCQlzaW5nbGUoZmQsIGUsIFRFU1RfQlVTWSB8IFRFU1RfVFJB SUxJTkdfSURMRSk7CiAKLQkJCS8qKgotCQkJICogQ2hlY2sgdGhhdCB0aGUgUE1VIGNhbiBiZSBz YWZlbHkgZW5hYmxlZCBpbiBmYWNlIG9mCi0JCQkgKiBpbnRlcnJ1cHQtaGVhdnkgZW5naW5lIGxv YWQuCi0JCQkgKi8KLQkJCWlndF9zdWJ0ZXN0X2YoImVuYWJsZS1yYWNlLSVzIiwgZS0+bmFtZSkK LQkJCQl0ZXN0X2VuYWJsZV9yYWNlKGZkLCBlKTsKLQotCQkJLyoqCi0JCQkgKiBDaGVjayBlbmdp bmUgYnVzeW5lc3MgYWNjdXJhY3kgaXMgYXMgZXhwZWN0ZWQuCi0JCQkgKi8KLQkJCWZvciAoaSA9 IDA7IGkgPCBBUlJBWV9TSVpFKHBjdCk7IGkrKykgewotCQkJCWlndF9zdWJ0ZXN0X2YoImJ1c3kt YWNjdXJhY3ktJXUtJXMiLAotCQkJCQkgICAgICBwY3RbaV0sIGUtPm5hbWUpCi0JCQkJCWFjY3Vy YWN5KGZkLCBlLCBwY3RbaV0sIDEwKTsKLQkJCX0KKwkJLyoqCisJCSAqIFRlc3QgdGhhdCB3aGVu IG9uZSBlbmdpbmUgaXMgbG9hZGVkIG90aGVyIHJlcG9ydCBubworCQkgKiBsb2FkLgorCQkgKi8K KwkJaWd0X3N1YnRlc3RfZigiYnVzeS1jaGVjay1hbGwtJXMiLCBlLT5uYW1lKQorCQkJYnVzeV9j aGVja19hbGwoZmQsIGUsIG51bV9lbmdpbmVzLCBURVNUX0JVU1kpOworCQlpZ3Rfc3VidGVzdF9m KCJidXN5LWlkbGUtY2hlY2stYWxsLSVzIiwgZS0+bmFtZSkKKwkJCWJ1c3lfY2hlY2tfYWxsKGZk LCBlLCBudW1fZW5naW5lcywKKwkJCQkgICAgICAgVEVTVF9CVVNZIHwgVEVTVF9UUkFJTElOR19J RExFKTsKKworCQkvKioKKwkJICogVGVzdCB0aGF0IHdoZW4gYWxsIGV4Y2VwdCBvbmUgZW5naW5l IGFyZSBsb2FkZWQgYWxsCisJCSAqIGxvYWRzIGFyZSBjb3JyZWN0bHkgcmVwb3J0ZWQuCisJCSAq LworCQlpZ3Rfc3VidGVzdF9mKCJtb3N0LWJ1c3ktY2hlY2stYWxsLSVzIiwgZS0+bmFtZSkKKwkJ CW1vc3RfYnVzeV9jaGVja19hbGwoZmQsIGUsIG51bV9lbmdpbmVzLAorCQkJCQkgICAgVEVTVF9C VVNZKTsKKwkJaWd0X3N1YnRlc3RfZigibW9zdC1idXN5LWlkbGUtY2hlY2stYWxsLSVzIiwgZS0+ bmFtZSkKKwkJCW1vc3RfYnVzeV9jaGVja19hbGwoZmQsIGUsIG51bV9lbmdpbmVzLAorCQkJCQkg ICAgVEVTVF9CVVNZIHwKKwkJCQkJICAgIFRFU1RfVFJBSUxJTkdfSURMRSk7CiAKLQkJCWlndF9z dWJ0ZXN0X2YoImJ1c3ktaGFuZy0lcyIsIGUtPm5hbWUpIHsKLQkJCQlpZ3RfaGFuZ190IGhhbmcg PSBpZ3RfYWxsb3dfaGFuZyhmZCwgMCwgMCk7CisJCS8qKgorCQkgKiBUZXN0IHRoYXQgc2VtcGhv cmUgY291bnRlcnMgcmVwb3J0IG5vIGFjdGl2aXR5IG9uCisJCSAqIGlkbGUgb3IgYnVzeSBlbmdp bmVzLgorCQkgKi8KKwkJaWd0X3N1YnRlc3RfZigiaWRsZS1uby1zZW1hcGhvcmVzLSVzIiwgZS0+ bmFtZSkKKwkJCW5vX3NlbWEoZmQsIGUsIDApOwogCi0JCQkJc2luZ2xlKGZkLCBlLCBURVNUX0JV U1kgfCBGTEFHX0hBTkcpOworCQlpZ3Rfc3VidGVzdF9mKCJidXN5LW5vLXNlbWFwaG9yZXMtJXMi LCBlLT5uYW1lKQorCQkJbm9fc2VtYShmZCwgZSwgVEVTVF9CVVNZKTsKIAotCQkJCWlndF9kaXNh bGxvd19oYW5nKGZkLCBoYW5nKTsKLQkJCX0KKwkJaWd0X3N1YnRlc3RfZigiYnVzeS1pZGxlLW5v LXNlbWFwaG9yZXMtJXMiLCBlLT5uYW1lKQorCQkJbm9fc2VtYShmZCwgZSwgVEVTVF9CVVNZIHwg VEVTVF9UUkFJTElOR19JRExFKTsKKworCQkvKioKKwkJICogVGVzdCB0aGF0IHNlbWFwaG9yZSB3 YWl0cyBhcmUgY29ycmVjdGx5IHJlcG9ydGVkLgorCQkgKi8KKwkJaWd0X3N1YnRlc3RfZigic2Vt YXBob3JlLXdhaXQtJXMiLCBlLT5uYW1lKQorCQkJc2VtYV93YWl0KGZkLCBlLCBURVNUX0JVU1kp OworCisJCWlndF9zdWJ0ZXN0X2YoInNlbWFwaG9yZS13YWl0LWlkbGUtJXMiLCBlLT5uYW1lKQor CQkJc2VtYV93YWl0KGZkLCBlLAorCQkJCSAgVEVTVF9CVVNZIHwgVEVTVF9UUkFJTElOR19JRExF KTsKKworCQkvKioKKwkJICogQ2hlY2sgdGhhdCB0d28gcGVyZiBjbGllbnRzIGRvIG5vdCBpbmZs dWVuY2UgZWFjaAorCQkgKiBvdGhlcnMgb2JzZXJ2YXRpb25zLgorCQkgKi8KKwkJaWd0X3N1YnRl c3RfZigibXVsdGktY2xpZW50LSVzIiwgZS0+bmFtZSkKKwkJCW11bHRpX2NsaWVudChmZCwgZSk7 CisKKwkJLyoqCisJCSAqIENoZWNrIHRoYXQgcmVwb3J0ZWQgdXNhZ2UgaXMgY29ycmVjdCB3aGVu IFBNVSBpcworCQkgKiBlbmFibGVkIGFmdGVyIHRoZSBiYXRjaCBpcyBydW5uaW5nLgorCQkgKi8K KwkJaWd0X3N1YnRlc3RfZigiYnVzeS1zdGFydC0lcyIsIGUtPm5hbWUpCisJCQlidXN5X3N0YXJ0 KGZkLCBlKTsKKworCQkvKioKKwkJICogQ2hlY2sgdGhhdCByZXBvcnRlZCB1c2FnZSBpcyBjb3Jy ZWN0IHdoZW4gUE1VIGlzCisJCSAqIGVuYWJsZWQgYWZ0ZXIgdHdvIGJhdGNoZXMgYXJlIHJ1bm5p bmcuCisJCSAqLworCQlpZ3Rfc3VidGVzdF9mKCJidXN5LWRvdWJsZS1zdGFydC0lcyIsIGUtPm5h bWUpIHsKKwkJCWdlbV9yZXF1aXJlX2NvbnRleHRzKGZkKTsKKwkJCWJ1c3lfZG91YmxlX3N0YXJ0 KGZkLCBlKTsKKwkJfQorCisJCS8qKgorCQkgKiBDaGVjayB0aGF0IHRoZSBQTVUgY2FuIGJlIHNh ZmVseSBlbmFibGVkIGluIGZhY2Ugb2YKKwkJICogaW50ZXJydXB0LWhlYXZ5IGVuZ2luZSBsb2Fk LgorCQkgKi8KKwkJaWd0X3N1YnRlc3RfZigiZW5hYmxlLXJhY2UtJXMiLCBlLT5uYW1lKQorCQkJ dGVzdF9lbmFibGVfcmFjZShmZCwgZSk7CisKKwkJLyoqCisJCSAqIENoZWNrIGVuZ2luZSBidXN5 bmVzcyBhY2N1cmFjeSBpcyBhcyBleHBlY3RlZC4KKwkJICovCisJCWZvciAoaSA9IDA7IGkgPCBB UlJBWV9TSVpFKHBjdCk7IGkrKykgeworCQkJaWd0X3N1YnRlc3RfZigiYnVzeS1hY2N1cmFjeS0l dS0lcyIsCisJCQkJICAgICAgcGN0W2ldLCBlLT5uYW1lKQorCQkJCWFjY3VyYWN5KGZkLCBlLCBw Y3RbaV0sIDEwKTsKKwkJfQorCisJCWlndF9zdWJ0ZXN0X2YoImJ1c3ktaGFuZy0lcyIsIGUtPm5h bWUpIHsKKwkJCWlndF9oYW5nX3QgaGFuZyA9IGlndF9hbGxvd19oYW5nKGZkLCAwLCAwKTsKKwor CQkJc2luZ2xlKGZkLCBlLCBURVNUX0JVU1kgfCBGTEFHX0hBTkcpOworCisJCQlpZ3RfZGlzYWxs b3dfaGFuZyhmZCwgaGFuZyk7CiAJCX0KIAogCQkvKioKQEAgLTE5MDEsMTkgKzE4OTUsMTIgQEAg aWd0X21haW4KIAkJfQogCiAJCV9fZm9yX2VhY2hfcGh5c2ljYWxfZW5naW5lKHJlbmRlcl9mZCwg ZSkgewotCQkJaWd0X3N1YnRlc3RfZ3JvdXAgewotCQkJCWlndF9maXh0dXJlIHsKLQkJCQkJZ2Vt X2NvbnRleHRfaGFzX2VuZ2luZShyZW5kZXJfZmQsCi0JCQkJCQkJICAgMCwgZS0+ZmxhZ3MpOwot CQkJCX0KLQotCQkJCWlndF9zdWJ0ZXN0X2YoInJlbmRlci1ub2RlLWJ1c3ktJXMiLCBlLT5uYW1l KQotCQkJCQlzaW5nbGUocmVuZGVyX2ZkLCBlLCBURVNUX0JVU1kpOwotCQkJCWlndF9zdWJ0ZXN0 X2YoInJlbmRlci1ub2RlLWJ1c3ktaWRsZS0lcyIsCi0JCQkJCSAgICAgIGUtPm5hbWUpCi0JCQkJ CXNpbmdsZShyZW5kZXJfZmQsIGUsCi0JCQkJCSAgICAgICBURVNUX0JVU1kgfCBURVNUX1RSQUlM SU5HX0lETEUpOwotCQkJfQorCQkJaWd0X3N1YnRlc3RfZigicmVuZGVyLW5vZGUtYnVzeS0lcyIs IGUtPm5hbWUpCisJCQkJc2luZ2xlKHJlbmRlcl9mZCwgZSwgVEVTVF9CVVNZKTsKKwkJCWlndF9z dWJ0ZXN0X2YoInJlbmRlci1ub2RlLWJ1c3ktaWRsZS0lcyIsCisJCQkJICAgICAgZS0+bmFtZSkK KwkJCQlzaW5nbGUocmVuZGVyX2ZkLCBlLAorCQkJCSAgICAgICBURVNUX0JVU1kgfCBURVNUX1RS QUlMSU5HX0lETEUpOwogCQl9CiAKIAkJaWd0X2ZpeHR1cmUgewotLSAKMi4xOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcg bGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=