From mboxrd@z Thu Jan 1 00:00:00 1970 From: tim.gore@intel.com Subject: [PATCH i-g-t] tests/gem_reset_stats.c: prepare for per engine resets Date: Wed, 18 Nov 2015 10:24:43 +0000 Message-ID: <1447842283-4226-1-git-send-email-tim.gore@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 63A8672136 for ; Wed, 18 Nov 2015 02:24:46 -0800 (PST) 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 Cc: mika.kuoppala@linux.com, thomas.wood@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVGltIEdvcmUgPHRpbS5nb3JlQGludGVsLmNvbT4KCndoZW4gY2hlY2tpbmcgdG8gbWFr ZSBzdXJlIHRoYXQgdGhlIGRyaXZlciBoYXMgcGVyZm9ybWVkCnRoZSBleHBlY3RlZCBudW1iZXIg b2YgcmVzZXRzLCB0aGlzIHRlc3QgbG9va3MgYXQgdGhlCnJlc2V0X2NvdW50LCB3aGljaCBpcyBp bmNyZW1lbnRlZCBlYWNoIHRpbWUgdGhlIEdQVSBpcwpyZXNldC4gVXBjb21pbmcgY2hhbmdlcyBp biB0aGUgd2F5IEdQVSBoYW5ncyBhcmUgaGFuZGxlZAptZWFuIHRoYXQgaW4gbW9zdCBjYXNlcyAo YW5kIGluIGFsbCB0aGUgY2FzZXMgaW4gdGhpcwp0ZXN0KSBvbmx5IGEgc2luZ2xlIEdQVSBlbmdp bmUgaXMgcmVzZXQgd2hpY2ggZG9lcyBub3QKY2F1c2UgdGhlIHJlc2V0X2NvdW50IHRvIGJlIGlu Y3JlbWVudGVkLiBUaGlzIGlzIGFscmVhZHkKY2F1c2luZyB0aGlzIHRlc3QgdG8gZmFpbCBvbiBB bmRyb2lkLiBJbiB0aGlzIGNhc2UKd2UgY2FuIGluc3RlYWQgbG9vayBhdCB0aGUgYmF0Y2hfYWN0 aXZlIGNvdW50IHdoaWNoIGlzCmFsc28gcmV0dXJuZWQgZnJvbSB0aGUgaTkxNV9nZXRfcmVzZXRf c3RhdHNfaW9jdGwgYW5kIGlzCmluY3JlbWVudGVkIGJ5IGJvdGggYSBzaW5nbGUgZW5naW5lIHJl c2V0IGFuZCBhIGZ1bGwKZ3B1IHJlc2V0LiBUaGVyZSBhcmUgZGlmZmVyZW5jZXMgYmV0d2VlbiB0 aGUgcmVzZXRfY291bnQKYW5kIHRoZSBiYXRjaF9hY3RpdmUgY291bnQsIGJ1dCBmb3IgZXN0YWJs aXNoaW5nIHRoYXQgdGhlCmNvcnJlY3QgbnVtYmVyIG9mIHJlc2V0cyBoYXZlIG9jY3VyZWQgZWl0 aGVyIGNhbiBiZSB1c2VkLgpUaGlzIGNoYW5nZSBlbmFibGVzIHRoaXMgdGVzdCB0byBydW4gc3Vj Y2Vzc2Z1bGx5IG9uCkFuZHJvaWQgYW5kIHdpbGwgbWVhbiB0aGF0IHRoZSB0ZXN0IGRvZXMgbm90 IGJyZWFrIHdoZW4KdGhlIFREUiBwYXRjaGVzIGdldCBtZXJnZWQgaW50byB0aGUgdXB0cmVhbSBk cml2ZXIuCgpTaWduZWQtb2ZmLWJ5OiBUaW0gR29yZSA8dGltLmdvcmVAaW50ZWwuY29tPgotLS0K IHRlc3RzL2dlbV9yZXNldF9zdGF0cy5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fcmVzZXRfc3RhdHMuYyBiL3Rlc3RzL2dl bV9yZXNldF9zdGF0cy5jCmluZGV4IDRjYmJiNGUuLjVlYzAyNmYgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L2dlbV9yZXNldF9zdGF0cy5jCisrKyBiL3Rlc3RzL2dlbV9yZXNldF9zdGF0cy5jCkBAIC0xMDQs OSArMTA0LDkgQEAgc3RhdGljIGludCBnZW1fcmVzZXRfc3RhdHMoaW50IGZkLCBpbnQgY3R4X2lk LAogCiAJcnMtPmN0eF9pZCA9IGN0eF9pZDsKIAlycy0+ZmxhZ3MgPSAwOwotCXJzLT5yZXNldF9j b3VudCA9IHJhbmQoKTsKLQlycy0+YmF0Y2hfYWN0aXZlID0gcmFuZCgpOwotCXJzLT5iYXRjaF9w ZW5kaW5nID0gcmFuZCgpOworCXJzLT5yZXNldF9jb3VudCA9IFVJTlQzMl9NQVg7CisJcnMtPmJh dGNoX2FjdGl2ZSA9IFVJTlQzMl9NQVg7CisJcnMtPmJhdGNoX3BlbmRpbmcgPSBVSU5UMzJfTUFY OwogCXJzLT5wYWQgPSAwOwogCiAJZG8gewpAQCAtNjkwLDYgKzY5MCwxOCBAQCBzdGF0aWMgaW50 IGdldF9yZXNldF9jb3VudChpbnQgZmQsIGludCBjdHgpCiAJcmV0dXJuIHJzLnJlc2V0X2NvdW50 OwogfQogCitzdGF0aWMgaW50IGdldF9hY3RpdmVfY291bnQoaW50IGZkLCBpbnQgY3R4KQorewor CWludCByZXQ7CisJc3RydWN0IGxvY2FsX2RybV9pOTE1X3Jlc2V0X3N0YXRzIHJzOworCisJcmV0 ID0gZ2VtX3Jlc2V0X3N0YXRzKGZkLCBjdHgsICZycyk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJl dDsKKworCXJldHVybiBycy5iYXRjaF9hY3RpdmU7Cit9CisKIHN0YXRpYyB2b2lkIHRlc3RfY2xv c2VfcGVuZGluZ19jdHgodm9pZCkKIHsKIAlpbnQgZmQsIGg7CkBAIC04MzcsMTcgKzg0OSwxNiBA QCBzdGF0aWMgdm9pZCB0ZXN0X3Jlc2V0X2NvdW50KGNvbnN0IGJvb2wgY3JlYXRlX2N0eCkKIAog CWFzc2VydF9yZXNldF9zdGF0dXMoZmQsIGN0eCwgUlNfTk9fRVJST1IpOwogCi0JYzEgPSBnZXRf cmVzZXRfY291bnQoZmQsIGN0eCk7Ci0JaWd0X2Fzc2VydChjMSA+PSAwKTsKKwljMSA9IGdldF9h Y3RpdmVfY291bnQoZmQsIGN0eCk7CisJaWd0X2Fzc2VydChjMSA9PSAwKTsKIAogCWggPSBpbmpl Y3RfaGFuZyhmZCwgY3R4KTsKIAlpZ3RfYXNzZXJ0X2x0ZSgwLCBoKTsKIAlnZW1fc3luYyhmZCwg aCk7CiAKIAlhc3NlcnRfcmVzZXRfc3RhdHVzKGZkLCBjdHgsIFJTX0JBVENIX0FDVElWRSk7Ci0J YzIgPSBnZXRfcmVzZXRfY291bnQoZmQsIGN0eCk7Ci0JaWd0X2Fzc2VydChjMiA+PSAwKTsKLQlp Z3RfYXNzZXJ0KGMyID09IChjMSArIDEpKTsKKwljMiA9IGdldF9hY3RpdmVfY291bnQoZmQsIGN0 eCk7CisJaWd0X2Fzc2VydChjMiA9PSAxKTsKIAogCWlndF9mb3JrKGNoaWxkLCAxKSB7CiAJCWln dF9kcm9wX3Jvb3QoKTsKQEAgLTg3Nyw5ICs4ODgsOSBAQCBzdGF0aWMgaW50IF90ZXN0X3BhcmFt cyhpbnQgZmQsIGludCBjdHgsIHVpbnQzMl90IGZsYWdzLCB1aW50MzJfdCBwYWQpCiAKIAlycy5j dHhfaWQgPSBjdHg7CiAJcnMuZmxhZ3MgPSBmbGFnczsKLQlycy5yZXNldF9jb3VudCA9IHJhbmQo KTsKLQlycy5iYXRjaF9hY3RpdmUgPSByYW5kKCk7Ci0JcnMuYmF0Y2hfcGVuZGluZyA9IHJhbmQo KTsKKwlycy5yZXNldF9jb3VudCA9IFVJTlQzMl9NQVg7CisJcnMuYmF0Y2hfYWN0aXZlID0gVUlO VDMyX01BWDsKKwlycy5iYXRjaF9wZW5kaW5nID0gVUlOVDMyX01BWDsKIAlycy5wYWQgPSBwYWQ7 CiAKIAlkbyB7CkBAIC05NzYsMTQgKzk4NywxNCBAQCBzdGF0aWMgdm9pZCBkZWZlcl9oYW5nY2hl Y2soaW50IHJpbmdfbnVtKQogCiAJaWd0X3NraXBfb24obmV4dF9yaW5nID09IGN1cnJlbnRfcmlu Zyk7CiAKLQljb3VudF9zdGFydCA9IGdldF9yZXNldF9jb3VudChmZCwgMCk7Ci0JaWd0X2Fzc2Vy dF9sdGUoMCwgY291bnRfc3RhcnQpOworCWNvdW50X3N0YXJ0ID0gZ2V0X2FjdGl2ZV9jb3VudChm ZCwgMCk7CisJaWd0X2Fzc2VydChjb3VudF9zdGFydCA9PSAwKTsKIAogCWlndF9hc3NlcnQoaW5q ZWN0X2hhbmdfcmluZyhmZCwgMCwgY3VycmVudF9yaW5nLT5leGVjLCB0cnVlKSk7CiAJd2hpbGUg KC0tc2Vjb25kcykgewogCQlpZ3RfYXNzZXJ0KGV4ZWNfdmFsaWRfcmluZyhmZCwgMCwgbmV4dF9y aW5nLT5leGVjKSk7CiAKLQkJY291bnRfZW5kID0gZ2V0X3Jlc2V0X2NvdW50KGZkLCAwKTsKKwkJ Y291bnRfZW5kID0gZ2V0X2FjdGl2ZV9jb3VudChmZCwgMCk7CiAJCWlndF9hc3NlcnRfbHRlKDAs IGNvdW50X2VuZCk7CiAKIAkJaWYgKGNvdW50X2VuZCA+IGNvdW50X3N0YXJ0KQpAQCAtOTkyLDcg KzEwMDMsNyBAQCBzdGF0aWMgdm9pZCBkZWZlcl9oYW5nY2hlY2soaW50IHJpbmdfbnVtKQogCQlz bGVlcCgxKTsKIAl9CiAKLQlpZ3RfYXNzZXJ0X2x0KGNvdW50X3N0YXJ0LCBjb3VudF9lbmQpOwor CWlndF9hc3NlcnQoY291bnRfZW5kID09IDEpOwogCiAJY2xvc2UoZmQpOwogfQotLSAKMS45LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==