From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tvrtko Ursulin Date: Mon, 25 Mar 2019 17:54:53 +0000 Message-Id: <20190325175453.27455-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] scripts/trace.pl: Fix after intel_engine_notify removal 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: Intel-gfx@lists.freedesktop.org, Tvrtko Ursulin List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFmdGVyIHRo ZSByZW1vdmFsIG9mIGVuZ2luZSBnbG9iYWwgc2Vxbm9zIGFuZCB0aGUgY29ycmVzcG9uZGluZwpp bnRlbF9lbmdpbmVfbm90aWZ5IHRyYWNlcG9pbnRzIHRoZSBzY3JpcHQgbmVlZHMgdG8gYmUgYWRq dXN0ZWQgdG8gY29wZQp3aXRoIHRoZSBuZXcgc3RhdGUgb2YgdGhpbmdzLgoKVG8ga2VlcCB3b3Jr aW5nIGl0IHN3aXRjaGVzIG92ZXIgdXNpbmcgdGhlIGRtYV9mZW5jZTpkbWFfZmVuY2Vfc2lnbmFs ZWQ6CnRyYWNlcG9pbnQgYW5kIGtlZXBzIG9uZSBleHRyYSBpbnRlcm5hbCBtYXAgdG8gY29ubmVj dCB0aGUgY3R4LXNlcW5vIHBhaXJzCndpdGggZW5naW5lcy4KCkl0IGFsc28gbmVlZHMgdG8ga2V5 IHRoZSBjb21wbGV0aW9uIGV2ZW50cyBvbiB0aGUgZnVsbCBlbmdpbmUvY3R4L3NlcW5vCnRva2Vu cywgYW5kIGFkanVzdCBjb3JyZXNwb25kaW5nbHkgdGhlIHRpbWVsaW5lIHNvcnRpbmcgbG9naWMu CgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgotLS0KTGlnaHRseSB0ZXN0c3RlZCwgc2VlbXMgdG8gd29yaywgYmV0dGVyIHRoYW4gbm90aGlu ZyBlZGl0aW9uLi4uCi0tLQogc2NyaXB0cy90cmFjZS5wbCB8IDc0ICsrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2Vy dGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NjcmlwdHMvdHJhY2UucGwg Yi9zY3JpcHRzL3RyYWNlLnBsCmluZGV4IDE4ZjlmM2IxODM5Ni4uNDM4NTMxYTE1YTQ3IDEwMDc1 NQotLS0gYS9zY3JpcHRzL3RyYWNlLnBsCisrKyBiL3NjcmlwdHMvdHJhY2UucGwKQEAgLTI3LDcg KzI3LDggQEAgdXNlIHdhcm5pbmdzOwogdXNlIDUuMDEwOwogCiBteSAkZ2lkID0gMDsKLW15ICgl ZGIsICVxdWV1ZSwgJXN1Ym1pdCwgJW5vdGlmeSwgJXJpbmdzLCAlY3R4ZGIsICVyaW5nbWFwLCAl cmVxd2FpdCwgJWN0eHRpbWVsaW5lcyk7CitteSAoJWRiLCAlcXVldWUsICVzdWJtaXQsICVub3Rp ZnksICVyaW5ncywgJWN0eGRiLCAlcmluZ21hcCwgJXJlcXdhaXQsCisgICAgJWN0eHRpbWVsaW5l cywgJWN0eGVuZ2luZXMpOwogbXkgQGZyZXFzOwogCiBteSAkbWF4X2l0ZW1zID0gMzAwMDsKQEAg LTY2LDcgKzY3LDcgQEAgTm90ZXM6CiAJCQkgICAgICAgaTkxNTppOTE1X3JlcXVlc3Rfc3VibWl0 LCBcCiAJCQkgICAgICAgaTkxNTppOTE1X3JlcXVlc3RfaW4sIFwKIAkJCSAgICAgICBpOTE1Omk5 MTVfcmVxdWVzdF9vdXQsIFwKLQkJCSAgICAgICBpOTE1OmludGVsX2VuZ2luZV9ub3RpZnksIFwK KwkJCSAgICAgICBkbWFfZmVuY2U6ZG1hX2ZlbmNlX3NpZ25hbGVkLCBcCiAJCQkgICAgICAgaTkx NTppOTE1X3JlcXVlc3Rfd2FpdF9iZWdpbiwgXAogCQkJICAgICAgIGk5MTU6aTkxNV9yZXF1ZXN0 X3dhaXRfZW5kIFwKIAkJCSAgICAgICBbY29tbWFuZC10by1iZS1wcm9maWxlZF0KQEAgLTE2MSw3 ICsxNjIsNyBAQCBzdWIgYXJnX3RyYWNlCiAJCSAgICAgICAnaTkxNTppOTE1X3JlcXVlc3Rfc3Vi bWl0JywKIAkJICAgICAgICdpOTE1Omk5MTVfcmVxdWVzdF9pbicsCiAJCSAgICAgICAnaTkxNTpp OTE1X3JlcXVlc3Rfb3V0JywKLQkJICAgICAgICdpOTE1OmludGVsX2VuZ2luZV9ub3RpZnknLAor CQkgICAgICAgJ2RtYV9mZW5jZTpkbWFfZmVuY2Vfc2lnbmFsZWQnLAogCQkgICAgICAgJ2k5MTU6 aTkxNV9yZXF1ZXN0X3dhaXRfYmVnaW4nLAogCQkgICAgICAgJ2k5MTU6aTkxNV9yZXF1ZXN0X3dh aXRfZW5kJyApOwogCkBAIC0zMTIsMTMgKzMxMyw2IEBAIHN1YiBkYl9rZXkKIAlyZXR1cm4gJHJp bmcgLiAnLycgLiAkY3R4IC4gJy8nIC4gJHNlcW5vOwogfQogCi1zdWIgZ2xvYmFsX2tleQotewot CW15ICgkcmluZywgJHNlcW5vKSA9IEBfOwotCi0JcmV0dXJuICRyaW5nIC4gJy8nIC4gJHNlcW5v OwotfQotCiBzdWIgc2FuaXRpemVfY3R4CiB7CiAJbXkgKCRjdHgsICRyaW5nKSA9IEBfOwpAQCAt NDE5LDYgKzQxMyw4IEBAIHdoaWxlICg8PikgewogCQkkcmVxeydyaW5nJ30gPSAkcmluZzsKIAkJ JHJlcXsnc2Vxbm8nfSA9ICRzZXFubzsKIAkJJHJlcXsnY3R4J30gPSAkY3R4OworCQlkaWUgaWYg ZXhpc3RzICRjdHhlbmdpbmVzeyRjdHh9IGFuZCAkY3R4ZW5naW5lc3skY3R4fSBuZSAkcmluZzsK KwkJJGN0eGVuZ2luZXN7JGN0eH0gPSAkcmluZzsKIAkJJGN0eHRpbWVsaW5lc3skY3R4IC4gJy8n IC4gJHJpbmd9ID0gMTsKIAkJJHJlcXsnbmFtZSd9ID0gJGN0eCAuICcvJyAuICRzZXFubzsKIAkJ JHJlcXsnZ2xvYmFsJ30gPSAkdHB7J2dsb2JhbCd9OwpAQCAtNDI5LDE2ICs0MjUsMjkgQEAgd2hp bGUgKDw+KSB7CiAJCSRyaW5nbWFweyRyaW5nc3skcmluZ319ID0gJHJpbmc7CiAJCSRkYnska2V5 fSA9IFwlcmVxOwogCX0gZWxzaWYgKCR0cF9uYW1lIGVxICdpOTE1Omk5MTVfcmVxdWVzdF9vdXQ6 JykgewotCQlteSAkZ2tleSA9IGdsb2JhbF9rZXkoJHJpbmcsICR0cHsnZ2xvYmFsJ30pOworCQlt eSAkZ2tleTsKKworCQlkaWUgdW5sZXNzIGV4aXN0cyAkY3R4ZW5naW5lc3skY3R4fTsKKworCQkk Z2tleSA9IGRiX2tleSgkY3R4ZW5naW5lc3skY3R4fSwgJGN0eCwgJHNlcW5vKTsKKworCQlpZiAo JHRweydjb21wbGV0ZWQ/J30pIHsKKwkJCWRpZSB1bmxlc3MgZXhpc3RzICRkYnska2V5fTsKKwkJ CWRpZSB1bmxlc3MgZXhpc3RzICRkYnska2V5fS0+eydzdGFydCd9OworCQkJZGllIGlmIGV4aXN0 cyAkZGJ7JGtleX0tPnsnZW5kJ307CisKKwkJCSRkYnska2V5fS0+eydlbmQnfSA9ICR0aW1lOwor CQkJJGRieyRrZXl9LT57J25vdGlmeSd9ID0gJG5vdGlmeXskZ2tleX0KKwkJCQkJCWlmIGV4aXN0 cyAkbm90aWZ5eyRna2V5fTsKKwkJfSBlbHNlIHsKKwkJCWRlbGV0ZSAkZGJ7JGtleX07CisJCX0K Kwl9IGVsc2lmICgkdHBfbmFtZSBlcSAnZG1hX2ZlbmNlOmRtYV9mZW5jZV9zaWduYWxlZDonKSB7 CisJCW15ICRna2V5OwogCi0JCWRpZSB1bmxlc3MgZXhpc3RzICRkYnska2V5fTsKLQkJZGllIHVu bGVzcyBleGlzdHMgJGRieyRrZXl9LT57J3N0YXJ0J307Ci0JCWRpZSBpZiBleGlzdHMgJGRieyRr ZXl9LT57J2VuZCd9OworCQlkaWUgdW5sZXNzIGV4aXN0cyAkY3R4ZW5naW5lc3skdHB7J2NvbnRl eHQnfX07CiAKLQkJJGRieyRrZXl9LT57J2VuZCd9ID0gJHRpbWU7Ci0JCSRkYnska2V5fS0+eydu b3RpZnknfSA9ICRub3RpZnl7JGdrZXl9IGlmIGV4aXN0cyAkbm90aWZ5eyRna2V5fTsKLQl9IGVs c2lmICgkdHBfbmFtZSBlcSAnaTkxNTppbnRlbF9lbmdpbmVfbm90aWZ5OicpIHsKLQkJbXkgJGdr ZXkgPSBnbG9iYWxfa2V5KCRyaW5nLCAkc2Vxbm8pOworCQkkZ2tleSA9IGRiX2tleSgkY3R4ZW5n aW5lc3skdHB7J2NvbnRleHQnfX0sICR0cHsnY29udGV4dCd9LCAkdHB7J3NlcW5vJ30pOwogCiAJ CSRub3RpZnl7JGdrZXl9ID0gJHRpbWUgdW5sZXNzIGV4aXN0cyAkbm90aWZ5eyRna2V5fTsKIAl9 IGVsc2lmICgkdHBfbmFtZSBlcSAnaTkxNTppbnRlbF9ncHVfZnJlcV9jaGFuZ2U6JykgewpAQCAt NDUyLDcgKzQ2MSw3IEBAIHdoaWxlICg8PikgewogIyBmaW5kIHRoZSBsYXJnZXN0IHNlcW5vIHRv IGJlIHVzZWQgZm9yIHRpbWVsaW5lIHNvcnRpbmcgcHVycG9zZXMuCiBteSAkbWF4X3NlcW5vID0g MDsKIGZvcmVhY2ggbXkgJGtleSAoa2V5cyAlZGIpIHsKLQlteSAkZ2tleSA9IGdsb2JhbF9rZXko JGRieyRrZXl9LT57J3JpbmcnfSwgJGRieyRrZXl9LT57J2dsb2JhbCd9KTsKKwlteSAkZ2tleSA9 IGRiX2tleSgkZGJ7JGtleX0tPnsncmluZyd9LCAkZGJ7JGtleX0tPnsnY3R4J30sICRkYnska2V5 fS0+eydzZXFubyd9KTsKIAogCWRpZSB1bmxlc3MgZXhpc3RzICRkYnska2V5fS0+eydzdGFydCd9 OwogCkBAIC00NzgsMTQgKzQ4NywxMyBAQCBteSAka2V5X2NvdW50ID0gc2NhbGFyKGtleXMgJWRi KTsKIAogbXkgJWVuZ2luZV90aW1lbGluZXM7CiAKLXN1YiBzb3J0RW5naW5lIHsKLQlteSAkYXMg PSAkZGJ7JGF9LT57J2dsb2JhbCd9OwotCW15ICRicyA9ICRkYnskYn0tPnsnZ2xvYmFsJ307Citz dWIgc29ydFN0YXJ0IHsKKwlteSAkYXMgPSAkZGJ7JGF9LT57J3N0YXJ0J307CisJbXkgJGJzID0g JGRieyRifS0+eydzdGFydCd9OwogCW15ICR2YWw7CiAKIAkkdmFsID0gJGFzIDw9PiAkYnM7Ci0K LQlkaWUgaWYgJHZhbCA9PSAwOworCSR2YWwgPSAkYSBjbXAgJGIgaWYgJHZhbCA9PSAwOwogCiAJ cmV0dXJuICR2YWw7CiB9CkBAIC00OTcsOSArNTA1LDcgQEAgc3ViIGdldF9lbmdpbmVfdGltZWxp bmUgewogCXJldHVybiAkZW5naW5lX3RpbWVsaW5lc3skcmluZ30gaWYgZXhpc3RzICRlbmdpbmVf dGltZWxpbmVzeyRyaW5nfTsKIAogCUB0aW1lbGluZSA9IGdyZXAgeyAkZGJ7JF99LT57J3Jpbmcn fSBlcSAkcmluZyB9IGtleXMgJWRiOwotCSMgRklYTUUgc2Vxbm8gcmVzdGFydAotCUB0aW1lbGlu ZSA9IHNvcnQgc29ydEVuZ2luZSBAdGltZWxpbmU7Ci0KKwlAdGltZWxpbmUgPSBzb3J0IHNvcnRT dGFydCBAdGltZWxpbmU7CiAJJGVuZ2luZV90aW1lbGluZXN7JHJpbmd9ID0gXEB0aW1lbGluZTsK IAogCXJldHVybiBcQHRpbWVsaW5lOwpAQCAtNTYxLDIwICs1NjcsMTAgQEAgZm9yZWFjaCBteSAk Z2lkIChzb3J0IGtleXMgJXJpbmdzKSB7CiAJCQkkZGJ7JGtleX0tPnsnbm8tbm90aWZ5J30gPSAx OwogCQl9CiAJCSRkYnska2V5fS0+eydlbmQnfSA9ICRlbmQ7CisJCSRkYnska2V5fS0+eydub3Rp ZnknfSA9ICRlbmQgaWYgJGRieyRrZXl9LT57J25vdGlmeSd9ID4gJGVuZDsKIAl9CiB9CiAKLXN1 YiBzb3J0U3RhcnQgewotCW15ICRhcyA9ICRkYnskYX0tPnsnc3RhcnQnfTsKLQlteSAkYnMgPSAk ZGJ7JGJ9LT57J3N0YXJ0J307Ci0JbXkgJHZhbDsKLQotCSR2YWwgPSAkYXMgPD0+ICRiczsKLQkk dmFsID0gJGEgY21wICRiIGlmICR2YWwgPT0gMDsKLQotCXJldHVybiAkdmFsOwotfQotCiBteSAk cmVfc29ydCA9IDE7CiBteSBAc29ydGVkX2tleXM7CiAKQEAgLTc1MCw5ICs3NDYsOSBAQCBmb3Jl YWNoIG15ICRnaWQgKHNvcnQga2V5cyAlcmluZ3MpIHsKIAkjIEV4dHJhY3QgYWxsIEdQVSBidXN5 IGludGVydmFscyBhbmQgc29ydCB0aGVtLgogCWZvcmVhY2ggbXkgJGtleSAoQHNvcnRlZF9rZXlz KSB7CiAJCW5leHQgdW5sZXNzICRkYnska2V5fS0+eydyaW5nJ30gZXEgJHJpbmc7CisJCWRpZSBp ZiAkZGJ7JGtleX0tPnsnc3RhcnQnfSA+ICRkYnska2V5fS0+eydlbmQnfTsKIAkJcHVzaCBAc18s ICRkYnska2V5fS0+eydzdGFydCd9OwogCQlwdXNoIEBlXywgJGRieyRrZXl9LT57J2VuZCd9Owot CQlkaWUgaWYgJGRieyRrZXl9LT57J3N0YXJ0J30gPiAkZGJ7JGtleX0tPnsnZW5kJ307CiAJfQog CiAJZGllIHVubGVzcyAkI3NfID09ICQjZV87Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1k ZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaWd0LWRldg==