From: Robert Bragg Subject: [PATCH igt v2 4/6] igt/gem_exec_parse: move hsw_load_register_reg down Date: Mon, 7 Nov 2016 22:27:01 +0000 Message-ID: <20161107222703.10784-5-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8608B6E2C1 for ; Mon, 7 Nov 2016 22:27:11 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u144so18961548wmu.0 for ; Mon, 07 Nov 2016 14:27:11 -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 Tm8gZnVuY3Rpb25hbCBjaGFuZ2UsIGp1c3QgbW92aW5nIGhzd19sb2FkX3JlZ3N0ZXJfcmVnIHRl c3QgY29kZSBkb3duCmJlbG93IHRoZSBleGVjYnVmIHV0aWxpdGllcyBpbiBwcmVwYXJhdGlvbiBm b3IgdXBkYXRpbmcgdG8gdXNlIHRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJv YmVydEBzaXhieW5pbmUub3JnPgotLS0KIHRlc3RzL2dlbV9leGVjX3BhcnNlLmMgfCAxNzQgKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDg3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rl c3RzL2dlbV9leGVjX3BhcnNlLmMgYi90ZXN0cy9nZW1fZXhlY19wYXJzZS5jCmluZGV4IDU0NzYw YmMuLmQ2NDFkMDUgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9leGVjX3BhcnNlLmMKKysrIGIvdGVz dHMvZ2VtX2V4ZWNfcGFyc2UuYwpAQCAtNjQsOTMgKzY0LDYgQEAgc3RhdGljIGludCBjb21tYW5k X3BhcnNlcl92ZXJzaW9uKGludCBmZCkKIAlyZXR1cm4gLTE7CiB9CiAKLXN0YXRpYyB2b2lkIGhz d19sb2FkX3JlZ2lzdGVyX3JlZyh2b2lkKQotewotCXVpbnQzMl90IGJ1ZlsxNl0gPSB7Ci0JCU1J X0xPQURfUkVHSVNURVJfSU1NIHwgKDUgLSAyKSwKLQkJSFNXX0NTX0dQUjAsCi0JCTB4YWJjZGFi Y2QsCi0JCUhTV19DU19HUFIxLAotCQkweGRlYWRiZWVmLAotCi0JCU1JX1NUT1JFX1JFR0lTVEVS X01FTSB8ICgzIC0gMiksCi0JCUhTV19DU19HUFIxLAotCQkwLCAvKiBhZGRyZXNzMCAqLwotCi0J CU1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKSwKLQkJSFNXX0NTX0dQUjAsCi0JCUhTV19D U19HUFIxLAotCi0JCU1JX1NUT1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiksCi0JCUhTV19DU19H UFIxLAotCQk0LCAvKiBhZGRyZXNzMSAqLwotCi0JCU1JX0JBVENIX0JVRkZFUl9FTkQsCi0JfTsK LQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7Ci0Jc3RydWN0IGRybV9p OTE1X2dlbV9leGVjX29iamVjdDIgb2JqWzJdOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVsb2Nh dGlvbl9lbnRyeSByZWxvY1syXTsKLQlpbnQgZmQ7Ci0KLQkvKiBPcGVuIGFnYWluIHRvIGdldCBh IG5vbi1tYXN0ZXIgZmlsZSBkZXNjcmlwdG9yICovCi0JZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJ VkVSX0lOVEVMKTsKLQotCWlndF9yZXF1aXJlKElTX0hBU1dFTEwoaW50ZWxfZ2V0X2RybV9kZXZp ZChmZCkpKTsKLQlpZ3RfcmVxdWlyZShjb21tYW5kX3BhcnNlcl92ZXJzaW9uKGZkKSA+PSA3KTsK LQotCW1lbXNldChvYmosIDAsIHNpemVvZihvYmopKTsKLQlvYmpbMF0uaGFuZGxlID0gZ2VtX2Ny ZWF0ZShmZCwgNDA5Nik7Ci0Jb2JqWzFdLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwot CWdlbV93cml0ZShmZCwgb2JqWzFdLmhhbmRsZSwgMCwgYnVmLCBzaXplb2YoYnVmKSk7Ci0KLQlt ZW1zZXQocmVsb2MsIDAsIHNpemVvZihyZWxvYykpOwotCXJlbG9jWzBdLm9mZnNldCA9IDcqc2l6 ZW9mKHVpbnQzMl90KTsKLQlyZWxvY1swXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsK LQlyZWxvY1swXS5kZWx0YSA9IDA7Ci0JcmVsb2NbMF0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1f RE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2NbMF0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0JcmVsb2NbMV0ub2Zmc2V0ID0gMTMqc2l6ZW9mKHVpbnQzMl90KTsKLQlyZWxv Y1sxXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsKLQlyZWxvY1sxXS5kZWx0YSA9IHNp emVvZih1aW50MzJfdCk7Ci0JcmVsb2NbMV0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0JcmVsb2NbMV0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1B TkQ7Ci0Jb2JqWzFdLnJlbG9jc19wdHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmpbMV0ucmVs b2NhdGlvbl9jb3VudCA9IDI7Ci0KLQltZW1zZXQoJmV4ZWNidWYsIDAsIHNpemVvZihleGVjYnVm KSk7Ci0JZXhlY2J1Zi5idWZmZXJzX3B0ciA9ICh1aW50cHRyX3Qpb2JqOwotCWV4ZWNidWYuYnVm ZmVyX2NvdW50ID0gMjsKLQlleGVjYnVmLmJhdGNoX2xlbiA9IHNpemVvZihidWYpOwotCWV4ZWNi dWYuZmxhZ3MgPSBJOTE1X0VYRUNfUkVOREVSOwotCWdlbV9leGVjYnVmKGZkLCAmZXhlY2J1Zik7 Ci0JZ2VtX2Nsb3NlKGZkLCBvYmpbMV0uaGFuZGxlKTsKLQotCWdlbV9yZWFkKGZkLCBvYmpbMF0u aGFuZGxlLCAwLCBidWYsIDIqc2l6ZW9mKGJ1ZlswXSkpOwotCWlndF9hc3NlcnRfZXFfdTMyKGJ1 ZlswXSwgMHhkZWFkYmVlZik7IC8qIGJlZm9yZSBjb3B5ICovCi0JaWd0X2Fzc2VydF9lcV91MzIo YnVmWzFdLCAweGFiY2RhYmNkKTsgLyogYWZ0ZXIgY29weSAqLwotCi0JLyogTm93IGEgY291cGxl IG9mIG5lZ2F0aXZlIHRlc3RzIHRoYXQgc2hvdWxkIGJlIGZpbHRlcmVkICovCi0JZXhlY2J1Zi5i dWZmZXJfY291bnQgPSAxOwotCWV4ZWNidWYuYmF0Y2hfbGVuID0gNCpzaXplb2YoYnVmWzBdKTsK LQotCWJ1ZlswXSA9IE1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKTsKLQlidWZbMV0gPSBI U1dfQ1NfR1BSMDsKLQlidWZbMl0gPSAwOwotCWJ1ZlszXSA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7 Ci0JZ2VtX3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVu KTsKLQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7 Ci0KLQlidWZbMl0gPSBERVJSTVI7IC8qIG1hc3RlciBvbmx5ICovCi0JZ2VtX3dyaXRlKGZkLCBv YmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0X2Vx KF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSAweDIw Mzg7IC8qIFJJTkdfU1RBUlQ6IGludmFsaWQgKi8KLQlnZW1fd3JpdGUoZmQsIG9ialswXS5oYW5k bGUsIDAsIGJ1ZiwgZXhlY2J1Zi5iYXRjaF9sZW4pOwotCWlndF9hc3NlcnRfZXEoX19nZW1fZXhl Y2J1ZihmZCwgJmV4ZWNidWYpLCAtRUlOVkFMKTsKLQotCWNsb3NlKGZkKTsKLX0KLQogc3RhdGlj IHZvaWQgZXhlY19iYXRjaF9wYXRjaGVkKGludCBmZCwgdWludDMyX3QgY21kX2JvLCB1aW50MzJf dCAqY21kcywKIAkJCSAgICAgICBpbnQgc2l6ZSwgaW50IHBhdGNoX29mZnNldCwgdWludDY0X3Qg ZXhwZWN0ZWRfdmFsdWUpCiB7CkBAIC0zMjMsNiArMjM2LDkzIEBAIHN0YXRpYyB2b2lkIGV4ZWNf YmF0Y2hfY2hhaW5lZChpbnQgZmQsIHVpbnQzMl90IGNtZF9ibywgdWludDMyX3QgKmNtZHMsCiAJ Z2VtX2Nsb3NlKGZkLCB0YXJnZXRfYm8pOwogfQogCitzdGF0aWMgdm9pZCBoc3dfbG9hZF9yZWdp c3Rlcl9yZWcodm9pZCkKK3sKKwl1aW50MzJfdCBidWZbMTZdID0geworCQlNSV9MT0FEX1JFR0lT VEVSX0lNTSB8ICg1IC0gMiksCisJCUhTV19DU19HUFIwLAorCQkweGFiY2RhYmNkLAorCQlIU1df Q1NfR1BSMSwKKwkJMHhkZWFkYmVlZiwKKworCQlNSV9TVE9SRV9SRUdJU1RFUl9NRU0gfCAoMyAt IDIpLAorCQlIU1dfQ1NfR1BSMSwKKwkJMCwgLyogYWRkcmVzczAgKi8KKworCQlNSV9MT0FEX1JF R0lTVEVSX1JFRyB8ICgzIC0gMiksCisJCUhTV19DU19HUFIwLAorCQlIU1dfQ1NfR1BSMSwKKwor CQlNSV9TVE9SRV9SRUdJU1RFUl9NRU0gfCAoMyAtIDIpLAorCQlIU1dfQ1NfR1BSMSwKKwkJNCwg LyogYWRkcmVzczEgKi8KKworCQlNSV9CQVRDSF9CVUZGRVJfRU5ELAorCX07CisJc3RydWN0IGRy bV9pOTE1X2dlbV9leGVjYnVmZmVyMiBleGVjYnVmOworCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhl Y19vYmplY3QyIG9ialsyXTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlbG9jYXRpb25fZW50cnkg cmVsb2NbMl07CisJaW50IGZkOworCisJLyogT3BlbiBhZ2FpbiB0byBnZXQgYSBub24tbWFzdGVy IGZpbGUgZGVzY3JpcHRvciAqLworCWZkID0gZHJtX29wZW5fZHJpdmVyKERSSVZFUl9JTlRFTCk7 CisKKwlpZ3RfcmVxdWlyZShJU19IQVNXRUxMKGludGVsX2dldF9kcm1fZGV2aWQoZmQpKSk7CisJ aWd0X3JlcXVpcmUoY29tbWFuZF9wYXJzZXJfdmVyc2lvbihmZCkgPj0gNyk7CisKKwltZW1zZXQo b2JqLCAwLCBzaXplb2Yob2JqKSk7CisJb2JqWzBdLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQw OTYpOworCW9ialsxXS5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsKKwlnZW1fd3JpdGUo ZmQsIG9ialsxXS5oYW5kbGUsIDAsIGJ1Ziwgc2l6ZW9mKGJ1ZikpOworCisJbWVtc2V0KHJlbG9j LCAwLCBzaXplb2YocmVsb2MpKTsKKwlyZWxvY1swXS5vZmZzZXQgPSA3KnNpemVvZih1aW50MzJf dCk7CisJcmVsb2NbMF0udGFyZ2V0X2hhbmRsZSA9IG9ialswXS5oYW5kbGU7CisJcmVsb2NbMF0u ZGVsdGEgPSAwOworCXJlbG9jWzBdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9DT01N QU5EOworCXJlbG9jWzBdLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOwor CXJlbG9jWzFdLm9mZnNldCA9IDEzKnNpemVvZih1aW50MzJfdCk7CisJcmVsb2NbMV0udGFyZ2V0 X2hhbmRsZSA9IG9ialswXS5oYW5kbGU7CisJcmVsb2NbMV0uZGVsdGEgPSBzaXplb2YodWludDMy X3QpOworCXJlbG9jWzFdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOwor CXJlbG9jWzFdLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOworCW9ialsx XS5yZWxvY3NfcHRyID0gKHVpbnRwdHJfdCkmcmVsb2M7CisJb2JqWzFdLnJlbG9jYXRpb25fY291 bnQgPSAyOworCisJbWVtc2V0KCZleGVjYnVmLCAwLCBzaXplb2YoZXhlY2J1ZikpOworCWV4ZWNi dWYuYnVmZmVyc19wdHIgPSAodWludHB0cl90KW9iajsKKwlleGVjYnVmLmJ1ZmZlcl9jb3VudCA9 IDI7CisJZXhlY2J1Zi5iYXRjaF9sZW4gPSBzaXplb2YoYnVmKTsKKwlleGVjYnVmLmZsYWdzID0g STkxNV9FWEVDX1JFTkRFUjsKKwlnZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpOworCWdlbV9jbG9z ZShmZCwgb2JqWzFdLmhhbmRsZSk7CisKKwlnZW1fcmVhZChmZCwgb2JqWzBdLmhhbmRsZSwgMCwg YnVmLCAyKnNpemVvZihidWZbMF0pKTsKKwlpZ3RfYXNzZXJ0X2VxX3UzMihidWZbMF0sIDB4ZGVh ZGJlZWYpOyAvKiBiZWZvcmUgY29weSAqLworCWlndF9hc3NlcnRfZXFfdTMyKGJ1ZlsxXSwgMHhh YmNkYWJjZCk7IC8qIGFmdGVyIGNvcHkgKi8KKworCS8qIE5vdyBhIGNvdXBsZSBvZiBuZWdhdGl2 ZSB0ZXN0cyB0aGF0IHNob3VsZCBiZSBmaWx0ZXJlZCAqLworCWV4ZWNidWYuYnVmZmVyX2NvdW50 ID0gMTsKKwlleGVjYnVmLmJhdGNoX2xlbiA9IDQqc2l6ZW9mKGJ1ZlswXSk7CisKKwlidWZbMF0g PSBNSV9MT0FEX1JFR0lTVEVSX1JFRyB8ICgzIC0gMik7CisJYnVmWzFdID0gSFNXX0NTX0dQUjA7 CisJYnVmWzJdID0gMDsKKwlidWZbM10gPSBNSV9CQVRDSF9CVUZGRVJfRU5EOworCWdlbV93cml0 ZShmZCwgb2JqWzBdLmhhbmRsZSwgMCwgYnVmLCBleGVjYnVmLmJhdGNoX2xlbik7CisJaWd0X2Fz c2VydF9lcShfX2dlbV9leGVjYnVmKGZkLCAmZXhlY2J1ZiksIC1FSU5WQUwpOworCisJYnVmWzJd ID0gREVSUk1SOyAvKiBtYXN0ZXIgb25seSAqLworCWdlbV93cml0ZShmZCwgb2JqWzBdLmhhbmRs ZSwgMCwgYnVmLCBleGVjYnVmLmJhdGNoX2xlbik7CisJaWd0X2Fzc2VydF9lcShfX2dlbV9leGVj YnVmKGZkLCAmZXhlY2J1ZiksIC1FSU5WQUwpOworCisJYnVmWzJdID0gMHgyMDM4OyAvKiBSSU5H X1NUQVJUOiBpbnZhbGlkICovCisJZ2VtX3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYs IGV4ZWNidWYuYmF0Y2hfbGVuKTsKKwlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZl eGVjYnVmKSwgLUVJTlZBTCk7CisKKwljbG9zZShmZCk7Cit9CisKIHN0YXRpYyB1aW50MzJfdCBo YW5kbGU7CiBzdGF0aWMgaW50IGZkOwogCi0tIAoyLjEwLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=