From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tvrtko Ursulin Date: Mon, 11 Feb 2019 11:45:23 +0000 Message-Id: <20190211114523.22844-2-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20190211114523.22844-1-tvrtko.ursulin@linux.intel.com> References: <20190211114523.22844-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 IGNvbW1hbmQgc3dpdGNoIGVuYWJsZXMgbG9nZ2luZyB0byBhIGZpbGUuCgp2MjoKICogU3VwcG9y dCAiLW8gLSIgZm9yIGV4cGxpY2l0IHN0ZG91dCBzZWxlY3Rpb24uIChDaHJpcyBXaWxzb24pCgpT aWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpS ZWZlcmVuY2VzOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDg2ODkKQ2M6IEVlcm8gVGFtbWluZW4gPGVlcm8udC50YW1taW5lbkBpbnRlbC5jb20+CkNjOiAz LjE0cGlAdWtyLm5ldApDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0t CiBtYW4vaW50ZWxfZ3B1X3RvcC5yc3QgfCAxOSArKysrKysrKy0tLS0tCiB0b29scy9pbnRlbF9n cHVfdG9wLmMgfCA2MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL21hbi9pbnRlbF9ncHVfdG9wLnJzdCBiL21hbi9pbnRlbF9ncHVfdG9wLnJzdApp bmRleCBkNWJkYTA5M2M4ZTguLmQ0ODdiYWNhMGM2MyAxMDA2NDQKLS0tIGEvbWFuL2ludGVsX2dw dV90b3AucnN0CisrKyBiL21hbi9pbnRlbF9ncHVfdG9wLnJzdApAQCAtMjgsMTYgKzI4LDIxIEBA IFRoZSB0b29sIGdhdGhlcnMgZGF0YSB1c2luZyBwZXJmIHBlcmZvcm1hbmNlIGNvdW50ZXJzIChQ TVUpIGV4cG9zZWQgYnkgaTkxNSBhbmQKIE9QVElPTlMKID09PT09PT0KIAotLXMgPG1zPgotICAg IFJlZnJlc2ggcGVyaW9kIGluIG1pbGxpc2Vjb25kcy4KKy1oCisgICAgU2hvdyBoZWxwIHRleHQu CisKKy1KCisgICAgT3V0cHV0IEpTT04gZm9ybWF0dGVkIGRhdGEuCiAKIC1sCi0gICAgTGlzdCB0 ZXh0IGRhdGEgdG8gc3RhbmRhcmQgb3V0LgorICAgIExpc3QgcGxhaW4gdGV4dCBkYXRhLgogCi0t SgotICAgIE91dHB1dCBKU09OIGZvcm1hdHRlZCBkYXRhIHRvIHN0YW5kYXJkIG91dHB1dC4KLS1o Ci0gICAgU2hvdyBoZWxwIHRleHQuCistbyA8ZmlsZSBwYXRoIHwgLT4KKyAgICBPdXRwdXQgdG8g dGhlIHNwZWNpZmllZCBmaWxlIGluc3RlYWQgb2Ygc3RhbmRhcmQgb3V0cHV0LgorICAgICctJyBj YW4gYWxzbyBiZSBzcGVjaWZpZWQgdG8gZXhwbGljaXRseSBzZWxlY3Qgc3RhbmRhcmQgb3V0cHV0 LgorCistcyA8bXM+CisgICAgUmVmcmVzaCBwZXJpb2QgaW4gbWlsbGlzZWNvbmRzLgogCiBMSU1J VEFUSU9OUwogPT09PT09PT09PT0KZGlmZiAtLWdpdCBhL3Rvb2xzL2ludGVsX2dwdV90b3AuYyBi L3Rvb2xzL2ludGVsX2dwdV90b3AuYwppbmRleCA5MDA5NzllZWE3YTEuLjYwNTA1YTYwNmJmYyAx MDA2NDQKLS0tIGEvdG9vbHMvaW50ZWxfZ3B1X3RvcC5jCisrKyBiL3Rvb2xzL2ludGVsX2dwdV90 b3AuYwpAQCAtNjkwLDEwICs2OTAsMTEgQEAgdXNhZ2UoY29uc3QgY2hhciAqYXBwbmFtZSkKIAkJ IlVzYWdlOiAlcyBbcGFyYW1ldGVyc11cbiIKIAkJIlxuIgogCQkiXHRUaGUgZm9sbG93aW5nIHBh cmFtZXRlcnMgYXJlIG9wdGlvbmFsOlxuXG4iCi0JCSJcdFstcyA8bXM+XSAgICAgICBSZWZyZXNo IHBlcmlvZCBpbiBtaWxsaXNlY29uZHMgKGRlZmF1bHQgJXVtcykuXG4iCi0JCSJcdFstbF0gICAg ICAgICAgICBMaXN0IGRhdGEgdG8gc3RhbmRhcmQgb3V0LlxuIgotCQkiXHRbLUpdICAgICAgICAg ICAgSlNPTiBkYXRhIHRvIHN0YW5kYXJkIG91dC5cbiIKIAkJIlx0Wy1oXSAgICAgICAgICAgIFNo b3cgdGhpcyBoZWxwIHRleHQuXG4iCisJCSJcdFstSl0gICAgICAgICAgICBPdXRwdXQgSlNPTiBm b3JtYXR0ZWQgZGF0YS5cbiIKKwkJIlx0Wy1sXSAgICAgICAgICAgIExpc3QgcGxhaW4gdGV4dCBk YXRhLlxuIgorCQkiXHRbLW8gPGZpbGV8LT5dICAgT3V0cHV0IHRvIHNwZWNpZmllZCBmaWxlIG9y ICctJyBmb3Igc3RhbmRhcmQgb3V0LlxuIgorCQkiXHRbLXMgPG1zPl0gICAgICAgUmVmcmVzaCBw ZXJpb2QgaW4gbWlsbGlzZWNvbmRzIChkZWZhdWx0ICV1bXMpLlxuIgogCQkiXG4iLAogCQlhcHBu YW1lLCBERUZBVUxUX1BFUklPRF9NUyk7CiB9CkBAIC03NDAsNiArNzQxLDggQEAgc3RhdGljIGNv bnN0IGNoYXIgKmpzb25faW5kZW50W10gPSB7CiBzdGF0aWMgdW5zaWduZWQgaW50IGpzb25fcHJl dl9zdHJ1Y3RfbWVtYmVyczsKIHN0YXRpYyB1bnNpZ25lZCBpbnQganNvbl9zdHJ1Y3RfbWVtYmVy czsKIAorRklMRSAqb3V0OworCiBzdGF0aWMgdm9pZAoganNvbl9vcGVuX3N0cnVjdChjb25zdCBj aGFyICpuYW1lKQogewpAQCAtNzQ5LDE0ICs3NTIsMTQgQEAganNvbl9vcGVuX3N0cnVjdChjb25z dCBjaGFyICpuYW1lKQogCWpzb25fc3RydWN0X21lbWJlcnMgPSAwOwogCiAJaWYgKG5hbWUpCi0J CXByaW50ZigiJXMlc1wiJXNcIjoge1xuIiwKLQkJICAgICAgIGpzb25fcHJldl9zdHJ1Y3RfbWVt YmVycyA/ICIsXG4iIDogIiIsCi0JCSAgICAgICBqc29uX2luZGVudFtqc29uX2luZGVudF9sZXZl bF0sCi0JCSAgICAgICBuYW1lKTsKKwkJZnByaW50ZihvdXQsICIlcyVzXCIlc1wiOiB7XG4iLAor CQkJanNvbl9wcmV2X3N0cnVjdF9tZW1iZXJzID8gIixcbiIgOiAiIiwKKwkJCWpzb25faW5kZW50 W2pzb25faW5kZW50X2xldmVsXSwKKwkJCW5hbWUpOwogCWVsc2UKLQkJcHJpbnRmKCIlc1xuJXN7 XG4iLAotCQkgICAgICAganNvbl9wcmV2X3N0cnVjdF9tZW1iZXJzID8gIiwiIDogIiIsCi0JCSAg ICAgICBqc29uX2luZGVudFtqc29uX2luZGVudF9sZXZlbF0pOworCQlmcHJpbnRmKG91dCwgIiVz XG4lc3tcbiIsCisJCQlqc29uX3ByZXZfc3RydWN0X21lbWJlcnMgPyAiLCIgOiAiIiwKKwkJCWpz b25faW5kZW50W2pzb25faW5kZW50X2xldmVsXSk7CiAKIAlqc29uX2luZGVudF9sZXZlbCsrOwog fQpAQCAtNzY2LDcgKzc2OSw3IEBAIGpzb25fY2xvc2Vfc3RydWN0KHZvaWQpCiB7CiAJYXNzZXJ0 KGpzb25faW5kZW50X2xldmVsID4gMCk7CiAKLQlwcmludGYoIlxuJXN9IiwganNvbl9pbmRlbnRb LS1qc29uX2luZGVudF9sZXZlbF0pOworCWZwcmludGYob3V0LCAiXG4lc30iLCBqc29uX2luZGVu dFstLWpzb25faW5kZW50X2xldmVsXSk7CiAKIAlpZiAoanNvbl9pbmRlbnRfbGV2ZWwgPT0gMCkK IAkJZmZsdXNoKHN0ZG91dCk7CkBAIC03NzgsMTcgKzc4MSwxNyBAQCBqc29uX2FkZF9tZW1iZXIo Y29uc3Qgc3RydWN0IGNudF9ncm91cCAqcGFyZW50LCBzdHJ1Y3QgY250X2l0ZW0gKml0ZW0sCiB7 CiAJYXNzZXJ0KGpzb25faW5kZW50X2xldmVsIDwgQVJSQVlfU0laRShqc29uX2luZGVudCkpOwog Ci0JcHJpbnRmKCIlcyVzXCIlc1wiOiAiLAorCWZwcmludGYob3V0LCAiJXMlc1wiJXNcIjogIiwK IAkJanNvbl9zdHJ1Y3RfbWVtYmVycyA/ICIsXG4iIDogIiIsCiAJCWpzb25faW5kZW50W2pzb25f aW5kZW50X2xldmVsXSwgaXRlbS0+bmFtZSk7CiAKIAlqc29uX3N0cnVjdF9tZW1iZXJzKys7CiAK IAlpZiAoIXN0cmNtcChpdGVtLT5uYW1lLCAidW5pdCIpKQotCQlwcmludGYoIlwiJXNcIiIsIGl0 ZW0tPnVuaXQpOworCQlmcHJpbnRmKG91dCwgIlwiJXNcIiIsIGl0ZW0tPnVuaXQpOwogCWVsc2UK LQkJcHJpbnRmKCIlZiIsCi0JCSAgICAgICBwbXVfY2FsYygmaXRlbS0+cG11LT52YWwsIGl0ZW0t PmQsIGl0ZW0tPnQsIGl0ZW0tPnMpKTsKKwkJZnByaW50ZihvdXQsICIlZiIsCisJCQlwbXVfY2Fs YygmaXRlbS0+cG11LT52YWwsIGl0ZW0tPmQsIGl0ZW0tPnQsIGl0ZW0tPnMpKTsKIAogCXJldHVy biAxOwogfQpAQCAtODExLDggKzgxNCw4IEBAIHN0ZG91dF9jbG9zZV9zdHJ1Y3Qodm9pZCkKIAlh c3NlcnQoc3Rkb3V0X2xldmVsID4gMCk7CiAJaWYgKC0tc3Rkb3V0X2xldmVsID09IDApIHsKIAkJ c3Rkb3V0X2xpbmVzKys7Ci0JCXByaW50ZigiXG4iKTsKLQkJZmZsdXNoKHN0ZG91dCk7CisJCWZw dXRzKCJcbiIsIG91dCk7CisJCWZmbHVzaChvdXQpOwogCX0KIH0KIApAQCAtODQ0LDEwICs4NDcs MTAgQEAgc3Rkb3V0X2FkZF9tZW1iZXIoY29uc3Qgc3RydWN0IGNudF9ncm91cCAqcGFyZW50LCBz dHJ1Y3QgY250X2l0ZW0gKml0ZW0sCiAJCQlncnBfdG90ICs9IDEgKyBpdC0+Zm10X2QgKyAoaXQt PmZtdF9kZCA/IDEgOiAwKTsKIAkJfQogCi0JCXByaW50ZigiJSpzICIsIGdycF90b3QgLSAxLCBw YXJlbnQtPmRpc3BsYXlfbmFtZSk7CisJCWZwcmludGYob3V0LCAiJSpzICIsIGdycF90b3QgLSAx LCBwYXJlbnQtPmRpc3BsYXlfbmFtZSk7CiAJCXJldHVybiAwOwogCX0gZWxzZSBpZiAoaGVhZGVy cyA9PSAyKSB7Ci0JCXByaW50ZigiJSpzICIsIGZtdF90b3QsIGl0ZW0tPnVuaXQgPzogaXRlbS0+ bmFtZSk7CisJCWZwcmludGYob3V0LCAiJSpzICIsIGZtdF90b3QsIGl0ZW0tPnVuaXQgPzogaXRl bS0+bmFtZSk7CiAJCXJldHVybiAwOwogCX0KIApAQCAtODU3LDcgKzg2MCw3IEBAIHN0ZG91dF9h ZGRfbWVtYmVyKGNvbnN0IHN0cnVjdCBjbnRfZ3JvdXAgKnBhcmVudCwgc3RydWN0IGNudF9pdGVt ICppdGVtLAogCWlmIChsZW4gPCAwIHx8IGxlbiA9PSBzaXplb2YoYnVmKSkKIAkJZmlsbF9zdHIo YnVmLCBzaXplb2YoYnVmKSwgJ1gnLCBmbXRfdG90KTsKIAotCWxlbiA9IHByaW50ZigiJXMgIiwg YnVmKTsKKwlsZW4gPSBmcHJpbnRmKG91dCwgIiVzICIsIGJ1Zik7CiAKIAlyZXR1cm4gbGVuID4g MCA/IGxlbiA6IDA7CiB9CkBAIC0xMjQ4LDEzICsxMjUxLDE3IEBAIGludCBtYWluKGludCBhcmdj LCBjaGFyICoqYXJndikKIHsKIAl1bnNpZ25lZCBpbnQgcGVyaW9kX3VzID0gREVGQVVMVF9QRVJJ T0RfTVMgKiAxMDAwOwogCWludCBjb25fdyA9IC0xLCBjb25faCA9IC0xOworCWNoYXIgKm91dHB1 dF9wYXRoID0gTlVMTDsKIAlzdHJ1Y3QgZW5naW5lcyAqZW5naW5lczsKIAl1bnNpZ25lZCBpbnQg aTsKIAlpbnQgcmV0LCBjaDsKIAogCS8qIFBhcnNlIG9wdGlvbnMgKi8KLQl3aGlsZSAoKGNoID0g Z2V0b3B0KGFyZ2MsIGFyZ3YsICJzOkpsaCIpKSAhPSAtMSkgeworCXdoaWxlICgoY2ggPSBnZXRv cHQoYXJnYywgYXJndiwgIm86czpKbGgiKSkgIT0gLTEpIHsKIAkJc3dpdGNoIChjaCkgeworCQlj YXNlICdvJzoKKwkJCW91dHB1dF9wYXRoID0gb3B0YXJnOworCQkJYnJlYWs7CiAJCWNhc2UgJ3Mn OgogCQkJcGVyaW9kX3VzID0gYXRvaShvcHRhcmcpICogMTAwMDsKIAkJCWJyZWFrOwpAQCAtMTI3 NCw5ICsxMjgxLDIxIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJfQogCX0K IAotCWlmIChvdXRwdXRfbW9kZSA9PSBJTlRFUkFDVElWRSAmJiBpc2F0dHkoMSkgIT0gMSkKKwlp ZiAob3V0cHV0X21vZGUgPT0gSU5URVJBQ1RJVkUgJiYgKG91dHB1dF9wYXRoIHx8IGlzYXR0eSgx KSAhPSAxKSkKIAkJb3V0cHV0X21vZGUgPSBTVERPVVQ7CiAKKwlpZiAob3V0cHV0X3BhdGggJiYg c3RyY21wKG91dHB1dF9wYXRoLCAiLSIpKSB7CisJCW91dCA9IGZvcGVuKG91dHB1dF9wYXRoLCAi dyIpOworCisJCWlmICghb3V0KSB7CisJCQlmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byBvcGVu IG91dHB1dCBmaWxlIC0gJyVzJyFcbiIsCisJCQkJc3RyZXJyb3IoZXJybm8pKTsKKwkJCWV4aXQo MSk7CisJCX0KKwl9IGVsc2UgeworCQlvdXQgPSBzdGRvdXQ7CisJfQorCiAJaWYgKG91dHB1dF9t b2RlICE9IElOVEVSQUNUSVZFKSB7CiAJCXNpZ2hhbmRsZXJfdCBzaWcgPSBzaWduYWwoU0lHSU5U LCBzaWdpbnRfaGFuZGxlcik7CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pZ3QtZGV2Cg==