From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tvrtko Ursulin Date: Fri, 8 Feb 2019 12:03:51 +0000 Message-Id: <20190208120351.18505-2-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20190208120351.18505-1-tvrtko.ursulin@linux.intel.com> References: <20190208120351.18505-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [IGT 2/2] tools/intel_gpu_top: Add file output capability 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, Eero Tamminen , 3.14pi@ukr.net, Tvrtko Ursulin List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkEgbmV3IC1v IGNvbW1hbmQgc3dpdGNoIGVuYWJsZXMgbG9nZ2luZyB0byBhIGZpbGUuCgpTaWduZWQtb2ZmLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZWZlcmVuY2VzOiBo dHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg2ODkKQ2M6IEVl cm8gVGFtbWluZW4gPGVlcm8udC50YW1taW5lbkBpbnRlbC5jb20+CkNjOiAzLjE0cGlAdWtyLm5l dApDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogbWFuL2lu dGVsX2dwdV90b3AucnN0IHwgMTggKysrKysrKystLS0tLQogdG9vbHMvaW50ZWxfZ3B1X3RvcC5j IHwgNjMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9tYW4vaW50ZWxfZ3B1X3RvcC5yc3QgYi9tYW4vaW50ZWxfZ3B1X3RvcC5yc3QKaW5kZXggZDVi ZGEwOTNjOGU4Li4xMzEzZWYwYmRlNWYgMTAwNjQ0Ci0tLSBhL21hbi9pbnRlbF9ncHVfdG9wLnJz dAorKysgYi9tYW4vaW50ZWxfZ3B1X3RvcC5yc3QKQEAgLTI4LDE2ICsyOCwyMCBAQCBUaGUgdG9v bCBnYXRoZXJzIGRhdGEgdXNpbmcgcGVyZiBwZXJmb3JtYW5jZSBjb3VudGVycyAoUE1VKSBleHBv c2VkIGJ5IGk5MTUgYW5kCiBPUFRJT05TCiA9PT09PT09CiAKLS1zIDxtcz4KLSAgICBSZWZyZXNo IHBlcmlvZCBpbiBtaWxsaXNlY29uZHMuCistaAorICAgIFNob3cgaGVscCB0ZXh0LgorCistSgor ICAgIE91dHB1dCBKU09OIGZvcm1hdHRlZCBkYXRhLgogCiAtbAotICAgIExpc3QgdGV4dCBkYXRh IHRvIHN0YW5kYXJkIG91dC4KKyAgICBMaXN0IHBsYWluIHRleHQgZGF0YS4KIAotLUoKLSAgICBP dXRwdXQgSlNPTiBmb3JtYXR0ZWQgZGF0YSB0byBzdGFuZGFyZCBvdXRwdXQuCi0taAotICAgIFNo b3cgaGVscCB0ZXh0LgorLW8gPGZpbGUgcGF0aD4KKyAgICBPdXRwdXQgdG8gdGhlIHNwZWNpZmll ZCBmaWxlIGluc3RlYWQgb2Ygc3RhbmRhcmQgb3V0cHV0LgorCistcyA8bXM+CisgICAgUmVmcmVz aCBwZXJpb2QgaW4gbWlsbGlzZWNvbmRzLgogCiBMSU1JVEFUSU9OUwogPT09PT09PT09PT0KZGlm ZiAtLWdpdCBhL3Rvb2xzL2ludGVsX2dwdV90b3AuYyBiL3Rvb2xzL2ludGVsX2dwdV90b3AuYwpp bmRleCA4MDdkNTE4YWFmODcuLmVjYmFiZmIzYmM3NSAxMDA2NDQKLS0tIGEvdG9vbHMvaW50ZWxf Z3B1X3RvcC5jCisrKyBiL3Rvb2xzL2ludGVsX2dwdV90b3AuYwpAQCAtNzAyLDEwICs3MDIsMTEg QEAgdXNhZ2UoY29uc3QgY2hhciAqYXBwbmFtZSkKIAkJIlVzYWdlOiAlcyBbcGFyYW1ldGVyc11c biIKIAkJIlxuIgogCQkiXHRUaGUgZm9sbG93aW5nIHBhcmFtZXRlcnMgYXJlIG9wdGlvbmFsOlxu XG4iCi0JCSJcdFstcyA8bXM+XSAgICAgICBSZWZyZXNoIHBlcmlvZCBpbiBtaWxsaXNlY29uZHMg KGRlZmF1bHQgJXVtcykuXG4iCi0JCSJcdFstbF0gICAgICAgICAgICBMaXN0IGRhdGEgdG8gc3Rh bmRhcmQgb3V0LlxuIgotCQkiXHRbLUpdICAgICAgICAgICAgSlNPTiBkYXRhIHRvIHN0YW5kYXJk IG91dC5cbiIKIAkJIlx0Wy1oXSAgICAgICAgICAgIFNob3cgdGhpcyBoZWxwIHRleHQuXG4iCisJ CSJcdFstSl0gICAgICAgICAgICBPdXRwdXQgSlNPTiBmb3JtYXR0ZWQgZGF0YS5cbiIKKwkJIlx0 Wy1sXSAgICAgICAgICAgIExpc3QgcGxhaW4gdGV4dCBkYXRhLlxuIgorCQkiXHRbLW8gPGZpbGU+ XSAgICAgT3V0cHV0IHRvIHNwZWNpZmllZCBmaWxlLlxuIgorCQkiXHRbLXMgPG1zPl0gICAgICAg UmVmcmVzaCBwZXJpb2QgaW4gbWlsbGlzZWNvbmRzIChkZWZhdWx0ICV1bXMpLlxuIgogCQkiXG4i LAogCQlhcHBuYW1lLCBERUZBVUxUX1BFUklPRF9NUyk7CiB9CkBAIC03NTIsNiArNzUzLDggQEAg c3RhdGljIGNvbnN0IGNoYXIgKmpzb25faW5kZW50W10gPSB7CiBzdGF0aWMgdW5zaWduZWQgaW50 IGpzb25fcHJldl9zdHJ1Y3RfbWVtYmVyczsKIHN0YXRpYyB1bnNpZ25lZCBpbnQganNvbl9zdHJ1 Y3RfbWVtYmVyczsKIAorRklMRSAqb3V0OworCiBzdGF0aWMgdm9pZAoganNvbl9vcGVuX3N0cnVj dChjb25zdCBjaGFyICpuYW1lKQogewpAQCAtNzYxLDE0ICs3NjQsMTQgQEAganNvbl9vcGVuX3N0 cnVjdChjb25zdCBjaGFyICpuYW1lKQogCWpzb25fc3RydWN0X21lbWJlcnMgPSAwOwogCiAJaWYg KG5hbWUpCi0JCXByaW50ZigiJXMlc1wiJXNcIjoge1xuIiwKLQkJICAgICAgIGpzb25fcHJldl9z dHJ1Y3RfbWVtYmVycyA/ICIsXG4iIDogIiIsCi0JCSAgICAgICBqc29uX2luZGVudFtqc29uX2lu ZGVudF9sZXZlbF0sCi0JCSAgICAgICBuYW1lKTsKKwkJZnByaW50ZihvdXQsICIlcyVzXCIlc1wi OiB7XG4iLAorCQkJanNvbl9wcmV2X3N0cnVjdF9tZW1iZXJzID8gIixcbiIgOiAiIiwKKwkJCWpz b25faW5kZW50W2pzb25faW5kZW50X2xldmVsXSwKKwkJCW5hbWUpOwogCWVsc2UKLQkJcHJpbnRm KCIlc1xuJXN7XG4iLAotCQkgICAgICAganNvbl9wcmV2X3N0cnVjdF9tZW1iZXJzID8gIiwiIDog IiIsCi0JCSAgICAgICBqc29uX2luZGVudFtqc29uX2luZGVudF9sZXZlbF0pOworCQlmcHJpbnRm KG91dCwgIiVzXG4lc3tcbiIsCisJCQlqc29uX3ByZXZfc3RydWN0X21lbWJlcnMgPyAiLCIgOiAi IiwKKwkJCWpzb25faW5kZW50W2pzb25faW5kZW50X2xldmVsXSk7CiAKIAlqc29uX2luZGVudF9s ZXZlbCsrOwogfQpAQCAtNzc4LDcgKzc4MSw3IEBAIGpzb25fY2xvc2Vfc3RydWN0KHZvaWQpCiB7 CiAJYXNzZXJ0KGpzb25faW5kZW50X2xldmVsID4gMCk7CiAKLQlwcmludGYoIlxuJXN9IiwganNv bl9pbmRlbnRbLS1qc29uX2luZGVudF9sZXZlbF0pOworCWZwcmludGYob3V0LCAiXG4lc30iLCBq c29uX2luZGVudFstLWpzb25faW5kZW50X2xldmVsXSk7CiAKIAlpZiAoanNvbl9pbmRlbnRfbGV2 ZWwgPT0gMCkKIAkJZmZsdXNoKHN0ZG91dCk7CkBAIC03OTAsMTcgKzc5MywxNyBAQCBqc29uX2Fk ZF9tZW1iZXIoY29uc3Qgc3RydWN0IGNudF9ncm91cCAqcGFyZW50LCBzdHJ1Y3QgY250X2l0ZW0g Kml0ZW0sCiB7CiAJYXNzZXJ0KGpzb25faW5kZW50X2xldmVsIDwgQVJSQVlfU0laRShqc29uX2lu ZGVudCkpOwogCi0JcHJpbnRmKCIlcyVzXCIlc1wiOiAiLAorCWZwcmludGYob3V0LCAiJXMlc1wi JXNcIjogIiwKIAkJanNvbl9zdHJ1Y3RfbWVtYmVycyA/ICIsXG4iIDogIiIsCiAJCWpzb25faW5k ZW50W2pzb25faW5kZW50X2xldmVsXSwgaXRlbS0+bmFtZSk7CiAKIAlqc29uX3N0cnVjdF9tZW1i ZXJzKys7CiAKIAlpZiAoIXN0cmNtcChpdGVtLT5uYW1lLCAidW5pdCIpKQotCQlwcmludGYoIlwi JXNcIiIsIGl0ZW0tPnVuaXQpOworCQlmcHJpbnRmKG91dCwgIlwiJXNcIiIsIGl0ZW0tPnVuaXQp OwogCWVsc2UKLQkJcHJpbnRmKCIlZiIsCi0JCSAgICAgICBwbXVfY2FsYygmaXRlbS0+cG11LT52 YWwsIGl0ZW0tPmQsIGl0ZW0tPnQsIGl0ZW0tPnMpKTsKKwkJZnByaW50ZihvdXQsICIlZiIsCisJ CQlwbXVfY2FsYygmaXRlbS0+cG11LT52YWwsIGl0ZW0tPmQsIGl0ZW0tPnQsIGl0ZW0tPnMpKTsK IAogCXJldHVybiAxOwogfQpAQCAtODIzLDggKzgyNiw4IEBAIHN0ZG91dF9jbG9zZV9zdHJ1Y3Qo dm9pZCkKIAlhc3NlcnQoc3Rkb3V0X2xldmVsID4gMCk7CiAJaWYgKC0tc3Rkb3V0X2xldmVsID09 IDApIHsKIAkJc3Rkb3V0X2xpbmVzKys7Ci0JCXByaW50ZigiXG4iKTsKLQkJZmZsdXNoKHN0ZG91 dCk7CisJCWZwdXRzKCJcbiIsIG91dCk7CisJCWZmbHVzaChvdXQpOwogCX0KIH0KIApAQCAtODU2 LDEwICs4NTksMTAgQEAgc3Rkb3V0X2FkZF9tZW1iZXIoY29uc3Qgc3RydWN0IGNudF9ncm91cCAq cGFyZW50LCBzdHJ1Y3QgY250X2l0ZW0gKml0ZW0sCiAJCQlncnBfdG90ICs9IDEgKyBpdC0+Zm10 X2QgKyAoaXQtPmZtdF9kZCA/IDEgOiAwKTsKIAkJfQogCi0JCXByaW50ZigiJSpzICIsIGdycF90 b3QgLSAxLCBwYXJlbnQtPmRpc3BsYXlfbmFtZSk7CisJCWZwcmludGYob3V0LCAiJSpzICIsIGdy cF90b3QgLSAxLCBwYXJlbnQtPmRpc3BsYXlfbmFtZSk7CiAJCXJldHVybiAwOwogCX0gZWxzZSBp ZiAoaGVhZGVycyA9PSAyKSB7Ci0JCXByaW50ZigiJSpzICIsIGZtdF90b3QsIGl0ZW0tPnVuaXQg PzogaXRlbS0+bmFtZSk7CisJCWZwcmludGYob3V0LCAiJSpzICIsIGZtdF90b3QsIGl0ZW0tPnVu aXQgPzogaXRlbS0+bmFtZSk7CiAJCXJldHVybiAwOwogCX0KIApAQCAtODY5LDcgKzg3Miw3IEBA IHN0ZG91dF9hZGRfbWVtYmVyKGNvbnN0IHN0cnVjdCBjbnRfZ3JvdXAgKnBhcmVudCwgc3RydWN0 IGNudF9pdGVtICppdGVtLAogCWlmIChsZW4gPCAwIHx8IGxlbiA9PSBzaXplb2YoYnVmKSkKIAkJ ZmlsbF9zdHIoYnVmLCBzaXplb2YoYnVmKSwgJ1gnLCBmbXRfdG90KTsKIAotCWxlbiA9IHByaW50 ZigiJXMgIiwgYnVmKTsKKwlsZW4gPSBmcHJpbnRmKG91dCwgIiVzICIsIGJ1Zik7CiAKIAlyZXR1 cm4gbGVuID4gMCA/IGxlbiA6IDA7CiB9CkBAIC0xMjYwLDEzICsxMjYzLDE3IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICoqYXJndikKIHsKIAl1bnNpZ25lZCBpbnQgcGVyaW9kX3VzID0gREVG QVVMVF9QRVJJT0RfTVMgKiAxMDAwOwogCWludCBjb25fdyA9IC0xLCBjb25faCA9IC0xOworCWNo YXIgKm91dHB1dF9wYXRoID0gTlVMTDsKIAlzdHJ1Y3QgZW5naW5lcyAqZW5naW5lczsKIAl1bnNp Z25lZCBpbnQgaTsKIAlpbnQgcmV0LCBjaDsKIAogCS8qIFBhcnNlIG9wdGlvbnMgKi8KLQl3aGls ZSAoKGNoID0gZ2V0b3B0KGFyZ2MsIGFyZ3YsICJzOkpsaCIpKSAhPSAtMSkgeworCXdoaWxlICgo Y2ggPSBnZXRvcHQoYXJnYywgYXJndiwgIm86czpKbGgiKSkgIT0gLTEpIHsKIAkJc3dpdGNoIChj aCkgeworCQljYXNlICdvJzoKKwkJCW91dHB1dF9wYXRoID0gb3B0YXJnOworCQkJYnJlYWs7CiAJ CWNhc2UgJ3MnOgogCQkJcGVyaW9kX3VzID0gYXRvaShvcHRhcmcpICogMTAwMDsKIAkJCWJyZWFr OwpAQCAtMTI4Niw5ICsxMjkzLDIxIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikK IAkJfQogCX0KIAotCWlmIChvdXRwdXRfbW9kZSA9PSBJTlRFUkFDVElWRSAmJiBpc2F0dHkoMSkg IT0gMSkKKwlpZiAob3V0cHV0X21vZGUgPT0gSU5URVJBQ1RJVkUgJiYgKG91dHB1dF9wYXRoIHx8 IGlzYXR0eSgxKSAhPSAxKSkKIAkJb3V0cHV0X21vZGUgPSBTVERPVVQ7CiAKKwlpZiAob3V0cHV0 X3BhdGgpIHsKKwkJb3V0ID0gZm9wZW4ob3V0cHV0X3BhdGgsICJ3Iik7CisKKwkJaWYgKCFvdXQp IHsKKwkJCWZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIG9wZW4gb3V0cHV0IGZpbGUgLSAnJXMn IVxuIiwKKwkJCQlzdHJlcnJvcihlcnJubykpOworCQkJZXhpdCgxKTsKKwkJfQorCX0gZWxzZSB7 CisJCW91dCA9IHN0ZG91dDsKKwl9CisKIAlpZiAob3V0cHV0X21vZGUgIT0gSU5URVJBQ1RJVkUp IHsKIAkJc2lnaGFuZGxlcl90IHNpZyA9IHNpZ25hbChTSUdJTlQsIHNpZ2ludF9oYW5kbGVyKTsK IAotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK