From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 492E56E19C for ; Thu, 14 Mar 2019 12:51:34 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20Winiarski?= Date: Thu, 14 Mar 2019 13:50:44 +0100 Message-ID: <20190314125050.14911-2-michal.winiarski@intel.com> In-Reply-To: <20190314125050.14911-1-michal.winiarski@intel.com> References: <20190314125050.14911-1-michal.winiarski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [CI 2/8] tests/perf: Simplify generic read/write, use sysfs helpers 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 List-ID: RG9pbmcgdGhpcyBsZXRzIHVzIGF2b2lkIGRybV9nZXRfY2FyZCwgd2hpY2ggd2UgcGxhbiB0byBy ZW1vdmUKZXZlbnR1YWxseS4KClNpZ25lZC1vZmYtYnk6IE1pY2hhxYIgV2luaWFyc2tpIDxtaWNo YWwud2luaWFyc2tpQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+Ci0tLQogdGVzdHMvcGVyZi5jIHwgODIgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMo KyksIDUyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL3BlcmYuYyBiL3Rlc3RzL3Bl cmYuYwppbmRleCAyMjBjNTJlZi4uZWNiYWRmY2QgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3BlcmYuYwor KysgYi90ZXN0cy9wZXJmLmMKQEAgLTE4NSw3ICsxODUsNiBAQCBzdGF0aWMgaW50IHN5c2ZzID0g LTE7CiBzdGF0aWMgaW50IHBtX2ZkID0gLTE7CiBzdGF0aWMgaW50IHN0cmVhbV9mZCA9IC0xOwog c3RhdGljIHVpbnQzMl90IGRldmlkOwotc3RhdGljIGludCBjYXJkID0gLTE7CiBzdGF0aWMgaW50 IG5fZXVzOwogCiBzdGF0aWMgdWludDY0X3QgdGVzdF9tZXRyaWNfc2V0X2lkID0gVUlOVDY0X01B WDsKQEAgLTI1OSw2MyArMjU4LDQ3IEBAIGxvb2t1cF9mb3JtYXQoaW50IGk5MTVfcGVyZl9mbXRf aWQpCiAJcmV0dXJuIGk5MTVfcGVyZl9mbXRfaWQ7CiB9CiAKLXN0YXRpYyBib29sCi10cnlfcmVh ZF91NjRfZmlsZShjb25zdCBjaGFyICpmaWxlLCB1aW50NjRfdCAqdmFsKQotewotCWNoYXIgYnVm WzMyXTsKLQlpbnQgZmQsIG47Ci0KLQlmZCA9IG9wZW4oZmlsZSwgT19SRE9OTFkpOwotCWlmIChm ZCA8IDApCi0JCXJldHVybiBmYWxzZTsKLQotCXdoaWxlICgobiA9IHJlYWQoZmQsIGJ1Ziwgc2l6 ZW9mKGJ1ZikgLSAxKSkgPCAwICYmIGVycm5vID09IEVJTlRSKQotCQk7Ci0JaWd0X2Fzc2VydChu ID49IDApOwotCi0JY2xvc2UoZmQpOwotCi0JYnVmW25dID0gJ1wwJzsKLQkqdmFsID0gc3RydG91 bGwoYnVmLCBOVUxMLCAwKTsKLQotCXJldHVybiB0cnVlOwotfQotCiBzdGF0aWMgdWludDY0X3QK LXJlYWRfdTY0X2ZpbGUoY29uc3QgY2hhciAqZmlsZSkKK3JlYWRfdTY0X2ZpbGUoY29uc3QgY2hh ciAqcGF0aCkKIHsKKwlGSUxFICpmOwogCXVpbnQ2NF90IHZhbDsKIAotCWlndF9hc3NlcnRfZXEo dHJ5X3JlYWRfdTY0X2ZpbGUoZmlsZSwgJnZhbCksIHRydWUpOworCWYgPSBmb3BlbihwYXRoLCAi ciIpOworCWlndF9hc3NlcnQoZik7CisKKwlpZ3RfYXNzZXJ0X2VxKGZzY2FuZihmLCAiJSJQUkl1 NjQsICZ2YWwpLCAxKTsKKworCWZjbG9zZShmKTsKIAogCXJldHVybiB2YWw7CiB9CiAKIHN0YXRp YyB2b2lkCi13cml0ZV91NjRfZmlsZShjb25zdCBjaGFyICpmaWxlLCB1aW50NjRfdCB2YWwpCit3 cml0ZV91NjRfZmlsZShjb25zdCBjaGFyICpwYXRoLCB1aW50NjRfdCB2YWwpCiB7Ci0JY2hhciBi dWZbMzJdOwotCWludCBmZCwgbGVuLCByZXQ7CisJRklMRSAqZjsKIAotCWZkID0gb3BlbihmaWxl LCBPX1dST05MWSk7Ci0JaWd0X2Fzc2VydChmZCA+PSAwKTsKKwlmID0gZm9wZW4ocGF0aCwgInIi KTsKKwlpZ3RfYXNzZXJ0KGYpOwogCi0JbGVuID0gc25wcmludGYoYnVmLCBzaXplb2YoYnVmKSwg IiUiUFJJdTY0LCB2YWwpOwotCWlndF9hc3NlcnQobGVuID4gMCk7CisJaWd0X2Fzc2VydChmcHJp bnRmKGYsICIlIlBSSXU2NCwgdmFsKSA+IDApOwogCi0Jd2hpbGUgKChyZXQgPSB3cml0ZShmZCwg YnVmLCBsZW4pKSA8IDAgJiYgZXJybm8gPT0gRUlOVFIpCi0JCTsKLQlpZ3RfYXNzZXJ0X2VxKHJl dCwgbGVuKTsKKwlmY2xvc2UoZik7Cit9CiAKLQljbG9zZShmZCk7CitzdGF0aWMgYm9vbAordHJ5 X3N5c2ZzX3JlYWRfdTY0KGNvbnN0IGNoYXIgKnBhdGgsIHVpbnQ2NF90ICp2YWwpCit7CisJcmV0 dXJuIGlndF9zeXNmc19zY2FuZihzeXNmcywgcGF0aCwgIiUiUFJJdTY0LCB2YWwpID09IDE7CiB9 CiAKIHN0YXRpYyB1bnNpZ25lZCBsb25nCi1zeXNmc19yZWFkKGNvbnN0IGNoYXIgKmZpbGUpCitz eXNmc19yZWFkKGNvbnN0IGNoYXIgKnBhdGgpCiB7CiAJdW5zaWduZWQgbG9uZyB2YWx1ZTsKIAot CWlndF9hc3NlcnQoaWd0X3N5c2ZzX3NjYW5mKHN5c2ZzLCBmaWxlLCAiJWx1IiwgJnZhbHVlKSA9 PSAxKTsKKwlpZ3RfYXNzZXJ0KGlndF9zeXNmc19zY2FuZihzeXNmcywgcGF0aCwgIiVsdSIsICZ2 YWx1ZSkgPT0gMSk7CiAKIAlyZXR1cm4gdmFsdWU7CiB9CkBAIC04NzYsNyArODU5LDYgQEAgaW5p dF9zeXNfaW5mbyh2b2lkKQogCWNvbnN0IGNoYXIgKnRlc3Rfc2V0X3V1aWQgPSBOVUxMOwogCWNo YXIgYnVmWzI1Nl07CiAKLQlpZ3RfYXNzZXJ0X25lcShjYXJkLCAtMSk7CiAJaWd0X2Fzc2VydF9u ZXEoZGV2aWQsIDApOwogCiAJdGltZXN0YW1wX2ZyZXF1ZW5jeSA9IGdldF9jc190aW1lc3RhbXBf ZnJlcXVlbmN5KCk7CkBAIC05NzksMTIgKzk2MSw5IEBAIGluaXRfc3lzX2luZm8odm9pZCkKIAog CW9hX2V4cF8xX21pbGxpc2VjID0gbWF4X29hX2V4cG9uZW50X2Zvcl9wZXJpb2RfbHRlKDEwMDAw MDApOwogCi0Jc25wcmludGYoYnVmLCBzaXplb2YoYnVmKSwKLQkJICIvc3lzL2NsYXNzL2RybS9j YXJkJWQvbWV0cmljcy8lcy9pZCIsCi0JCSBjYXJkLAotCQkgdGVzdF9zZXRfdXVpZCk7CisJc25w cmludGYoYnVmLCBzaXplb2YoYnVmKSwgIm1ldHJpY3MvJXMvaWQiLCB0ZXN0X3NldF91dWlkKTsK IAotCXJldHVybiB0cnlfcmVhZF91NjRfZmlsZShidWYsICZ0ZXN0X21ldHJpY19zZXRfaWQpOwor CXJldHVybiB0cnlfc3lzZnNfcmVhZF91NjQoYnVmLCAmdGVzdF9tZXRyaWNfc2V0X2lkKTsKIH0K IAogc3RhdGljIGludApAQCAtMzczOSwxMCArMzcxOCwxMCBAQCB0ZXN0X2ludmFsaWRfcmVtb3Zl X3VzZXJzcGFjZV9jb25maWcodm9pZCkKIAogCWlndF9yZXF1aXJlKGhhc19pOTE1X3BlcmZfdXNl cnNwYWNlX2NvbmZpZyhkcm1fZmQpKTsKIAotCXNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwg Ii9zeXMvY2xhc3MvZHJtL2NhcmQlZC9tZXRyaWNzLyVzL2lkIiwgY2FyZCwgdXVpZCk7CisJc25w cmludGYocGF0aCwgc2l6ZW9mKHBhdGgpLCAibWV0cmljcy8lcy9pZCIsIHV1aWQpOwogCiAJLyog RGVzdHJveSBwcmV2aW91cyBjb25maWd1cmF0aW9uIGlmIHByZXNlbnQgKi8KLQlpZiAodHJ5X3Jl YWRfdTY0X2ZpbGUocGF0aCwgJmNvbmZpZ19pZCkpCisJaWYgKHRyeV9zeXNmc19yZWFkX3U2NChw YXRoLCAmY29uZmlnX2lkKSkKIAkJaTkxNV9wZXJmX3JlbW92ZV9jb25maWcoZHJtX2ZkLCBjb25m aWdfaWQpOwogCiAJbWVtc2V0KCZjb25maWcsIDAsIHNpemVvZihjb25maWcpKTsKQEAgLTM3OTks MTAgKzM3NzgsMTAgQEAgdGVzdF9jcmVhdGVfZGVzdHJveV91c2Vyc3BhY2VfY29uZmlnKHZvaWQp CiAKIAlpZ3RfcmVxdWlyZShoYXNfaTkxNV9wZXJmX3VzZXJzcGFjZV9jb25maWcoZHJtX2ZkKSk7 CiAKLQlzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksICIvc3lzL2NsYXNzL2RybS9jYXJkJWQv bWV0cmljcy8lcy9pZCIsIGNhcmQsIHV1aWQpOworCXNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRo KSwgIm1ldHJpY3MvJXMvaWQiLCB1dWlkKTsKIAogCS8qIERlc3Ryb3kgcHJldmlvdXMgY29uZmln dXJhdGlvbiBpZiBwcmVzZW50ICovCi0JaWYgKHRyeV9yZWFkX3U2NF9maWxlKHBhdGgsICZjb25m aWdfaWQpKQorCWlmICh0cnlfc3lzZnNfcmVhZF91NjQocGF0aCwgJmNvbmZpZ19pZCkpCiAJCWk5 MTVfcGVyZl9yZW1vdmVfY29uZmlnKGRybV9mZCwgY29uZmlnX2lkKTsKIAogCW1lbXNldCgmY29u ZmlnLCAwLCBzaXplb2YoY29uZmlnKSk7CkBAIC0zODgxLDkgKzM4NjAsOSBAQCB0ZXN0X3doaXRl bGlzdGVkX3JlZ2lzdGVyc191c2Vyc3BhY2VfY29uZmlnKHZvaWQpCiAKIAlpZ3RfcmVxdWlyZSho YXNfaTkxNV9wZXJmX3VzZXJzcGFjZV9jb25maWcoZHJtX2ZkKSk7CiAKLQlzbnByaW50ZihwYXRo LCBzaXplb2YocGF0aCksICIvc3lzL2NsYXNzL2RybS9jYXJkJWQvbWV0cmljcy8lcy9pZCIsIGNh cmQsIHV1aWQpOworCXNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwgIm1ldHJpY3MvJXMvaWQi LCB1dWlkKTsKIAotCWlmICh0cnlfcmVhZF91NjRfZmlsZShwYXRoLCAmY29uZmlnX2lkKSkKKwlp ZiAodHJ5X3N5c2ZzX3JlYWRfdTY0KHBhdGgsICZjb25maWdfaWQpKQogCQlpOTE1X3BlcmZfcmVt b3ZlX2NvbmZpZyhkcm1fZmQsIGNvbmZpZ19pZCk7CiAKIAltZW1zZXQoJmNvbmZpZywgMCwgc2l6 ZW9mKGNvbmZpZykpOwpAQCAtNDAzNCw3ICs0MDEzLDYgQEAgdGVzdF9pOTE1X3JlZl9jb3VudCh2 b2lkKQogCiAJZHJtX2ZkID0gX19kcm1fb3Blbl9kcml2ZXIoRFJJVkVSX0lOVEVMKTsKIAlkZXZp ZCA9IGludGVsX2dldF9kcm1fZGV2aWQoZHJtX2ZkKTsKLQljYXJkID0gZHJtX2dldF9jYXJkKCk7 CiAKIAkvKiBOb3RlOiB0aGVzZSBnbG9iYWwgdmFyaWFibGVzIGFyZSBvbmx5IGluaXRpYWxpemVk IGFmdGVyIGNhbGxpbmcKIAkgKiBpbml0X3N5c19pbmZvKCkuLi4KQEAgLTQxMTEsNyArNDA4OSw3 IEBAIGlndF9tYWluCiAJCWlndF9yZXF1aXJlX2dlbShkcm1fZmQpOwogCiAJCWRldmlkID0gaW50 ZWxfZ2V0X2RybV9kZXZpZChkcm1fZmQpOwotCQlzeXNmcyA9IGlndF9zeXNmc19vcGVuKGRybV9m ZCwgJmNhcmQpOworCQlzeXNmcyA9IGlndF9zeXNmc19vcGVuKGRybV9mZCwgTlVMTCk7CiAKIAkJ aWd0X3JlcXVpcmUoaW5pdF9zeXNfaW5mbygpKTsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdApp Z3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=