From: Robert Bragg Subject: [PATCH igt v2 6/6] igt/gem_exec_parse: update for version 8 changes Date: Mon, 7 Nov 2016 22:27:03 +0000 Message-ID: <20161107222703.10784-7-robert@sixbynine.org> References: <20161107222703.10784-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1B1B6E2C7 for ; Mon, 7 Nov 2016 22:27:13 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so8169560wme.2 for ; Mon, 07 Nov 2016 14:27:13 -0800 (PST) In-Reply-To: <20161107222703.10784-1-robert@sixbynine.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBhZGFwdHMgdGhlIHRlc3RzIHRvIGFjY291bnQgZm9yIHRoZSBwYXJzZXIgbm8gbG9uZ2Vy IHJlcG9ydGluZwpwcml2aWxlZ2UgdmlvbGF0aW9ucyBiYWNrIHRvIHVzZXJzcGFjZSBhcyBFSU5W QUwgZXJyb3JzICh0aGV5IGFyZSBsZWZ0CnRvIHRoZSBIVyBjb21tYW5kIHBhcnNlciB0byBzcXVh c2ggdGhlIGNvbW1hbmRzIHRvIE5PT1BTKS4KClRoZSBpbnRlcmZhY2UgY2hhbmdlIGlzbid0IGV4 cGVjdGVkIHRvIGFmZmVjdCB1c2Vyc3BhY2UgYW5kIGluIGZhY3QgaXQKbG9va3MgbGlrZSB0aGUg cHJldmlvdXMgYmVoYXZpb3VyIHdhcyBsaWFibGUgdG8gYnJlYWsgdXNlcnNwYWNlLCBzdWNoIGFz Ck1lc2Egd2hpY2ggZXhwbGljaXRseSB0cmllcyB0byBvYnNlcnZlIHdoZXRoZXIgT0FDT05UUk9M IExSSXMgYXJlCnNxdWFzaGVkIHRvIE5PT1BzIGJ1dCBNZXNhIHdpbGwgYWJvcnQgZm9yIGV4ZWNi dWZmZXIgZXJyb3JzLgoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0IEJyYWdnIDxyb2JlcnRAc2l4Ynlu aW5lLm9yZz4KLS0tCiB0ZXN0cy9nZW1fZXhlY19wYXJzZS5jIHwgOTUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3NCBp bnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fZXhl Y19wYXJzZS5jIGIvdGVzdHMvZ2VtX2V4ZWNfcGFyc2UuYwppbmRleCAxYzA5Y2YyLi5jOThmODA5 IDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fZXhlY19wYXJzZS5jCisrKyBiL3Rlc3RzL2dlbV9leGVj X3BhcnNlLmMKQEAgLTM3LDYgKzM3LDcgQEAKICNkZWZpbmUgQVJSQVlfTEVOKEEpIChzaXplb2Yo QSkgLyBzaXplb2YoQVswXSkpCiAKICNkZWZpbmUgREVSUk1SIDB4NDQwNTAKKyNkZWZpbmUgT0FD T05UUk9MIDB4MjM2MAogI2RlZmluZSBTT19XUklURV9PRkZTRVRfMCAweDUyODAKIAogI2RlZmlu ZSBIU1dfQ1NfR1BSKG4pICgweDI2MDAgKyA4KihuKSkKQEAgLTMxMCwxMCArMzExLDIxIEBAIHN0 YXRpYyB2b2lkIGhzd19sb2FkX3JlZ2lzdGVyX3JlZyh2b2lkKQogCX0KIAogCWZvciAoaW50IGkg PSAwIDsgaSA8IEFSUkFZX0xFTihkaXNhbGxvd2VkX3JlZ3MpOyBpKyspIHsKKwkJZXhlY19iYXRj aChmZCwgaGFuZGxlLCBpbml0X2dwcjAsIHNpemVvZihpbml0X2dwcjApLAorCQkJICAgSTkxNV9F WEVDX1JFTkRFUiwKKwkJCSAgIDApOworCQlleGVjX2JhdGNoX3BhdGNoZWQoZmQsIGhhbmRsZSwK KwkJCQkgICBzdG9yZV9ncHIwLCBzaXplb2Yoc3RvcmVfZ3ByMCksCisJCQkJICAgMiAqIHNpemVv Zih1aW50MzJfdCksIC8qIHJlbG9jICovCisJCQkJICAgMHhhYmNkYWJjMCk7CiAJCWRvX2xyclsx XSA9IGRpc2FsbG93ZWRfcmVnc1tpXTsKIAkJZXhlY19iYXRjaChmZCwgaGFuZGxlLCBkb19scnIs IHNpemVvZihkb19scnIpLAogCQkJICAgSTkxNV9FWEVDX1JFTkRFUiwKLQkJCSAgIC1FSU5WQUwp OworCQkJICAgMCk7CisJCWV4ZWNfYmF0Y2hfcGF0Y2hlZChmZCwgaGFuZGxlLAorCQkJCSAgIHN0 b3JlX2dwcjAsIHNpemVvZihzdG9yZV9ncHIwKSwKKwkJCQkgICAyICogc2l6ZW9mKHVpbnQzMl90 KSwgLyogcmVsb2MgKi8KKwkJCQkgICAweGFiY2RhYmMwKTsKIAl9CiAKIAljbG9zZShmZCk7CkBA IC0zNjAsNTcgKzM3Miw5NSBAQCBpZ3RfbWFpbgogCX0KIAogCWlndF9zdWJ0ZXN0KCJiYXNpYy1y ZWplY3RlZCIpIHsKLQkJdWludDMyX3QgYXJiX29uX29mZltdID0gewotCQkJTUlfQVJCX09OX09G RiwKKwkJdWludDMyX3QgaW52YWxpZF9jbWRbXSA9IHsKKwkJCSgweDc8PDI5KSwgLyogUmVzZXJ2 ZWQgY29tbWFuZCB0eXBlLAorCQkJCSAgICAgIGFjcm9zcyBhbGwgZW5naW5lcyAqLwogCQkJTUlf QkFUQ0hfQlVGRkVSX0VORCwKIAkJfTsKLQkJdWludDMyX3QgZGlzcGxheV9mbGlwW10gPSB7Ci0J CQlNSV9ESVNQTEFZX0ZMSVAsCi0JCQkwLCAwLCAwLAorCQl1aW50MzJfdCBpbnZhbGlkX3NldF9j b250ZXh0W10gPSB7CisJCQlNSV9TRVRfQ09OVEVYVCB8IDMyLCAvKiBpbnZhbGlkIGxlbmd0aCAq LwogCQkJTUlfQkFUQ0hfQlVGRkVSX0VORCwKLQkJCTAKIAkJfTsKIAkJZXhlY19iYXRjaChmZCwg aGFuZGxlLAotCQkJICAgYXJiX29uX29mZiwgc2l6ZW9mKGFyYl9vbl9vZmYpLAorCQkJICAgaW52 YWxpZF9jbWQsIHNpemVvZihpbnZhbGlkX2NtZCksCiAJCQkgICBJOTE1X0VYRUNfUkVOREVSLAog CQkJICAgLUVJTlZBTCk7CiAJCWV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwKLQkJCSAgIGFyYl9vbl9v ZmYsIHNpemVvZihhcmJfb25fb2ZmKSwKKwkJCSAgIGludmFsaWRfY21kLCBzaXplb2YoaW52YWxp ZF9jbWQpLAogCQkJICAgSTkxNV9FWEVDX0JTRCwKIAkJCSAgIC1FSU5WQUwpOworCQlpZiAoZ2Vt X2hhc19ibHQoZmQpKSB7CisJCQlleGVjX2JhdGNoKGZkLCBoYW5kbGUsCisJCQkJICAgaW52YWxp ZF9jbWQsIHNpemVvZihpbnZhbGlkX2NtZCksCisJCQkJICAgSTkxNV9FWEVDX0JMVCwKKwkJCQkg ICAtRUlOVkFMKTsKKwkJfQogCQlpZiAoZ2VtX2hhc192ZWJveChmZCkpIHsKIAkJCWV4ZWNfYmF0 Y2goZmQsIGhhbmRsZSwKLQkJCQkgICBhcmJfb25fb2ZmLCBzaXplb2YoYXJiX29uX29mZiksCisJ CQkJICAgaW52YWxpZF9jbWQsIHNpemVvZihpbnZhbGlkX2NtZCksCiAJCQkJICAgSTkxNV9FWEVD X1ZFQk9YLAogCQkJCSAgIC1FSU5WQUwpOwogCQl9CisKIAkJZXhlY19iYXRjaChmZCwgaGFuZGxl LAotCQkJICAgZGlzcGxheV9mbGlwLCBzaXplb2YoZGlzcGxheV9mbGlwKSwKLQkJCSAgIEk5MTVf RVhFQ19CTFQsCisJCQkgICBpbnZhbGlkX3NldF9jb250ZXh0LCBzaXplb2YoaW52YWxpZF9zZXRf Y29udGV4dCksCisJCQkgICBJOTE1X0VYRUNfUkVOREVSLAogCQkJICAgLUVJTlZBTCk7CiAJfQog CiAJaWd0X3N1YnRlc3QoInJlZ2lzdGVycyIpIHsKIAkJdWludDMyX3QgbHJpX2JhZFtdID0gewog CQkJTUlfTE9BRF9SRUdJU1RFUl9JTU0sCi0JCQkwLCAvKiBkaXNhbGxvd2VkIHJlZ2lzdGVyIGFk ZHJlc3MgKi8KLQkJCTB4MTIwMDAwMDAsCisJCQlPQUNPTlRST0wsIC8qIGRpc2FsbG93ZWQgcmVn aXN0ZXIgYWRkcmVzcyAqLworCQkJMHgzMTMzNzAwMCwKIAkJCU1JX0JBVENIX0JVRkZFUl9FTkQs CiAJCX07CiAJCXVpbnQzMl90IGxyaV9va1tdID0gewogCQkJTUlfTE9BRF9SRUdJU1RFUl9JTU0s Ci0JCQkweDUyODAsIC8qIGFsbG93ZWQgcmVnaXN0ZXIgYWRkcmVzcyAoU09fV1JJVEVfT0ZGU0VU WzBdKSAqLwotCQkJMHgxLAorCQkJU09fV1JJVEVfT0ZGU0VUXzAsIC8qIGFsbG93ZWQgcmVnaXN0 ZXIgYWRkcmVzcyAqLworCQkJMHhhYmNkYWJjMCwgLyogWzE6MF0gTUJaICovCiAJCQlNSV9CQVRD SF9CVUZGRVJfRU5ELAogCQl9OworCQl1aW50MzJfdCBzdG9yZV9yZWdbXSA9IHsKKwkJCU1JX1NU T1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiksCisJCQkwLCAvKiByZWcgKi8KKwkJCTAsIC8qIHJl bG9jICovCisJCQlNSV9CQVRDSF9CVUZGRVJfRU5ELAorCQl9OworCQl1aW50NjRfdCB2YWw7CisK KwkJLyogTm90ZTogd2UgaW50ZW50aW9uYWxseSBwaWNrIE9BQ09OVFJPTCBhcyB0aGUgZGlzYWxs b3dlZAorCQkgKiByZWdpc3RlciB0byB0ZXN0IGhlcmUgc2luY2UgaXQgdXNlZCB0byBiZSB3aGl0 ZSBsaXN0ZWQgYnkKKwkJICogdGhlIGNvbW1hbmQgcGFyc2VyLgorCQkgKgorCQkgKiBJdCdzIGVz cGVjaWFsbHkgaW1wb3J0YW50IHRvIGNoZWNrIHRoYXQgYW4gTFJJIHRvIE9BQ09OVFJPTAorCQkg KiBkb2Vzbid0IHJlc3VsdCBpbiBhbiBFSU5WQUwgZXJyb3IgYmVjYXVzZSBNZXNhIGF0dGVtcHRz CisJCSAqIHdyaXRpbmcgdG8gT0FDT05UUk9MIHRvIGRldGVybWluZSB3aGF0IGV4dGVuc2lvbnMg dG8gZXhwb3NlCisJCSAqIGFuZCB3aWxsIGFib3J0KCkgZm9yIGV4ZWNidWZmZXIoKSBlcnJvcnMu CisJCSAqCisJCSAqIE1lc2EgY2FuIGdyYWNlZnVsbHkgcmVjb2duaXNlIGFuZCBoYW5kbGUgdGhl IExSSSBiZWNvbWluZworCQkgKiBhIE5PT1AuCisJCSAqLwogCQlleGVjX2JhdGNoKGZkLCBoYW5k bGUsCiAJCQkgICBscmlfYmFkLCBzaXplb2YobHJpX2JhZCksCiAJCQkgICBJOTE1X0VYRUNfUkVO REVSLAotCQkJICAgLUVJTlZBTCk7CisJCQkgICAwKTsKKwkJc3RvcmVfcmVnWzFdID0gT0FDT05U Uk9MOworCQl2YWwgPSBfX2V4ZWNfYmF0Y2hfcGF0Y2hlZChmZCwgaGFuZGxlLAorCQkJCQkgICBz dG9yZV9yZWcsIHNpemVvZihzdG9yZV9yZWcpLAorCQkJCQkgICA4KTsgLyogcmVsb2Mgb2Zmc2V0 ICovCisJCWlndF9hc3NlcnRfbmVxKHZhbCwgMHgzMTMzNzAwMCk7CisKIAkJZXhlY19iYXRjaChm ZCwgaGFuZGxlLAogCQkJICAgbHJpX29rLCBzaXplb2YobHJpX29rKSwKIAkJCSAgIEk5MTVfRVhF Q19SRU5ERVIsCiAJCQkgICAwKTsKKwkJc3RvcmVfcmVnWzFdID0gU09fV1JJVEVfT0ZGU0VUXzA7 CisJCWV4ZWNfYmF0Y2hfcGF0Y2hlZChmZCwgaGFuZGxlLAorCQkJCSAgIHN0b3JlX3JlZywKKwkJ CQkgICBzaXplb2Yoc3RvcmVfcmVnKSwKKwkJCQkgICAyICogc2l6ZW9mKHVpbnQzMl90KSwgLyog cmVsb2Mgb2Zmc2V0ICovCisJCQkJICAgMHhhYmNkYWJjMCk7CiAJfQogCiAJaWd0X3N1YnRlc3Qo ImJpdG1hc2tzIikgewpAQCAtNDIzLDEwICs0NzMsMTMgQEAgaWd0X21haW4KIAkJCTAsCiAJCQlN SV9CQVRDSF9CVUZGRVJfRU5ELAogCQl9OwotCQlleGVjX2JhdGNoKGZkLCBoYW5kbGUsCi0JCQkg ICBwYywgc2l6ZW9mKHBjKSwKLQkJCSAgIEk5MTVfRVhFQ19SRU5ERVIsCi0JCQkgICAtRUlOVkFM KTsKKwkJLyogRXhwZWN0IHRvIHJlYWQgYmFjayB6ZXJvIHNpbmNlIHRoZSBjb21tYW5kIHNob3Vs ZCBiZQorCQkgKiBzcXVhc2hlZCB0byBhIE5PT1AKKwkJICovCisJCWV4ZWNfYmF0Y2hfcGF0Y2hl ZChmZCwgaGFuZGxlLAorCQkJCSAgIHBjLCBzaXplb2YocGMpLAorCQkJCSAgIDgsIC8qIHBhdGNo IG9mZnNldCwgKi8KKwkJCQkgICAweDApOwogCX0KIAogCWlndF9zdWJ0ZXN0KCJiYXRjaC13aXRo b3V0LWVuZCIpIHsKLS0gCjIuMTAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==