From mboxrd@z Thu Jan 1 00:00:00 1970 From: Derek Morton Subject: [PATCH i-g-t] gem_flink_race/prime_self_import: Improve test reliability Date: Tue, 8 Dec 2015 12:44:44 +0000 Message-ID: <1449578684-16320-1-git-send-email-derek.j.morton@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B29956E6FB for ; Tue, 8 Dec 2015 04:45:23 -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: thomas.wood@intel.com List-Id: intel-gfx@lists.freedesktop.org Z2VtX2ZsaW5rX3JhY2UgYW5kIHByaW1lX3NlbGZfaW1wb3J0IGhhdmUgc3VidGVzdHMgd2hpY2gg cmVhZCB0aGUKbnVtYmVyIG9mIG9wZW4gZ2VtIG9iamVjdHMgZnJvbSBkZWJ1Z2ZzIHRvIGRldGVy bWluZSBpZiBvYmplY3RzIGhhdmUKbGVha2VkIGR1cmluZyB0aGUgdGVzdC4gSG93ZXZlciB0aGUg dGVzdCBjYW4gZmFpbCBzcG9yYWRpY2FsbHkgaWYKdGhlIG51bWJlciBvZiBnZW0gb2JqZWN0cyBj aGFuZ2VzIGR1ZSB0byBvdGhlciBwcm9jZXNzIGFjdGl2aXR5LgpUaGlzIHBhdGNoIGludHJvZHVj ZXMgYSBjaGFuZ2UgdG8gY2hlY2sgdGhlIG51bWJlciBvZiBnZW0gb2JqZWN0cwpzZXZlcmFsIHRp bWVzIHRvIGZpbHRlciBvdXQgYW55IGZsdWN0dWF0aW9ucy4KClNpZ25lZC1vZmYtYnk6IERlcmVr IE1vcnRvbiA8ZGVyZWsuai5tb3J0b25AaW50ZWwuY29tPgotLS0KIHRlc3RzL2dlbV9mbGlua19y YWNlLmMgICAgfCAzNCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiB0ZXN0cy9w cmltZV9zZWxmX2ltcG9ydC5jIHwgNDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2MiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fZmxpbmtfcmFjZS5jIGIvdGVzdHMvZ2VtX2Zs aW5rX3JhY2UuYwppbmRleCBiMTdlZjg1Li4wNTUyZTEyIDEwMDY0NAotLS0gYS90ZXN0cy9nZW1f ZmxpbmtfcmFjZS5jCisrKyBiL3Rlc3RzL2dlbV9mbGlua19yYWNlLmMKQEAgLTQ0LDcgKzQ0LDcg QEAgSUdUX1RFU1RfREVTQ1JJUFRJT04oIkNoZWNrIGZvciBmbGluay9vcGVuIHZzLiBnZW0gY2xv c2UgcmFjZXMuIik7CiAgKiBpbiB0aGUgZmxpbmsgbmFtZSBhbmQgY29ycmVzcG9uZGluZyByZWZl cmVuY2UgZ2V0dGluZyBsZWFrZWQuCiAgKi8KIAotLyogV2Ugd2FudCBsb2NrbGVzcyBhbmQgSSdt IHRvIGxhenkgdG8gZGlnIG91dCBhbiBhdG9taWMgbGliYXJhcnkuIE9uIHg4NiB0aGlzCisvKiBX ZSB3YW50IGxvY2tsZXNzIGFuZCBJJ20gdG8gbGF6eSB0byBkaWcgb3V0IGFuIGF0b21pYyBsaWJy YXJ5LiBPbiB4ODYgdGhpcwogICogd29ya3MsIHRvby4gKi8KIHZvbGF0aWxlIGludCBwbHNfZGll ID0gMDsKIGludCBmZDsKQEAgLTY1LDYgKzY1LDMyIEBAIHN0YXRpYyBpbnQgZ2V0X29iamVjdF9j b3VudCh2b2lkKQogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyBpbnQgZ2V0X3N0YWJsZV9vYmpf Y291bnQoaW50IGRyaXZlcikKK3sKKwkvKiBUaGUgdGVzdCByZWxpZXMgb24gdGhlIHN5c3RlbSBi ZWluZyBpbiB0aGUgc2FtZSBzdGF0ZSBiZWZvcmUgYW5kCisJICAgYWZ0ZXIgdGhlIHRlc3Qgc28g YW55IGRpZmZlcmVuY2UgaW4gdGhlIG9iamVjdCBjb3VudCBpcyBhIHJlc3VsdCBvZgorCSAgIGxl YWtzIGR1cmluZyB0aGUgdGVzdC4gZ2VtX3F1aWVzY2VudF9ncHUoKSBtb3N0bHkgYWNoaWV2ZXMg dGhpcyBidXQKKwkgICBvY2Nhc2lvbmFsbHkgb2JqX2NvdW50IGNhbiBzdGlsbCBjaGFuZ2UuIFRo ZSBsb29wIGVuc3VyZXMgb2JqX2NvdW50CisJICAgaGFzIHJlbWFpbmVkIHN0YWJsZSBvdmVyIHNl dmVyYWwgY2hlY2tzICovCisJaW50IG9ial9jb3VudCwgcHJldl9vYmpfY291bnQ7CisJaW50IGxv b3BfY291bnQgPSAwOworCWdlbV9xdWllc2NlbnRfZ3B1KGRyaXZlcik7CisJcHJldl9vYmpfY291 bnQgPSBnZXRfb2JqZWN0X2NvdW50KCk7CisJd2hpbGUgKGxvb3BfY291bnQgPCA0KSB7CisJCXVz bGVlcCgyMDAwMDApOworCQlnZW1fcXVpZXNjZW50X2dwdShkcml2ZXIpOworCQlvYmpfY291bnQg PSBnZXRfb2JqZWN0X2NvdW50KCk7CisJCWlmIChvYmpfY291bnQgPT0gcHJldl9vYmpfY291bnQp IHsKKwkJCWxvb3BfY291bnQrKzsKKwkJfSBlbHNlIHsKKwkJCWlndF9kZWJ1ZygibG9vcF9jb3Vu dD0lZCwgb2JqX2NvdW50PSVkLCBwcmV2X29ial9jb3VudD0lZFxuIiwgbG9vcF9jb3VudCwgb2Jq X2NvdW50LCBwcmV2X29ial9jb3VudCk7CisJCQlsb29wX2NvdW50ID0gMDsKKwkJCXByZXZfb2Jq X2NvdW50ID0gb2JqX2NvdW50OworCQl9CisKKwl9CisJcmV0dXJuIG9ial9jb3VudDsKK30KIAog c3RhdGljIHZvaWQgKnRocmVhZF9mbl9mbGlua19uYW1lKHZvaWQgKnApCiB7CkBAIC0xNjQsOCAr MTkwLDcgQEAgc3RhdGljIHZvaWQgdGVzdF9mbGlua19jbG9zZSh2b2lkKQogCSAqIHVwIHRoZSBj b3VudHMgKi8KIAlmYWtlID0gZHJtX29wZW5fZHJpdmVyKERSSVZFUl9JTlRFTCk7CiAKLQlnZW1f cXVpZXNjZW50X2dwdShmYWtlKTsKLQlvYmpfY291bnQgPSBnZXRfb2JqZWN0X2NvdW50KCk7CisJ b2JqX2NvdW50ID0gZ2V0X3N0YWJsZV9vYmpfY291bnQoZmFrZSk7CiAKIAludW1fdGhyZWFkcyA9 IHN5c2NvbmYoX1NDX05QUk9DRVNTT1JTX09OTE4pOwogCkBAIC0xOTAsOCArMjE1LDcgQEAgc3Rh dGljIHZvaWQgdGVzdF9mbGlua19jbG9zZSh2b2lkKQogCiAJY2xvc2UoZmQpOwogCi0JZ2VtX3F1 aWVzY2VudF9ncHUoZmFrZSk7Ci0Jb2JqX2NvdW50ID0gZ2V0X29iamVjdF9jb3VudCgpIC0gb2Jq X2NvdW50OworCW9ial9jb3VudCA9IGdldF9zdGFibGVfb2JqX2NvdW50KGZha2UpIC0gb2JqX2Nv dW50OwogCiAJaWd0X2luZm8oImxlYWtlZCAlaSBvYmplY3RzXG4iLCBvYmpfY291bnQpOwogCmRp ZmYgLS1naXQgYS90ZXN0cy9wcmltZV9zZWxmX2ltcG9ydC5jIGIvdGVzdHMvcHJpbWVfc2VsZl9p bXBvcnQuYwppbmRleCA5MWZlMjMxLi45NzdjN2IyIDEwMDY0NAotLS0gYS90ZXN0cy9wcmltZV9z ZWxmX2ltcG9ydC5jCisrKyBiL3Rlc3RzL3ByaW1lX3NlbGZfaW1wb3J0LmMKQEAgLTQ3LDcgKzQ3 LDcgQEAKICNpbmNsdWRlICJkcm0uaCIKIAogSUdUX1RFU1RfREVTQ1JJUFRJT04oIkNoZWNrIHdo ZXRoZXIgcHJpbWUgaW1wb3J0L2V4cG9ydCB3b3JrcyBvbiB0aGUgc2FtZSIKLQkJICAgICAiIGRl dmljZS4iKTsKKwkJICAgICAiIGRldmljZS4uLiBidXQgd2l0aCBkaWZmZXJlbnQgZmRzLiIpOwog CiAjZGVmaW5lIEJPX1NJWkUgKDE2KjEwMjQpCiAKQEAgLTE1Nyw3ICsxNTcsNyBAQCBzdGF0aWMg dm9pZCB0ZXN0X3dpdGhfb25lX2JvX3R3b19maWxlcyh2b2lkKQogCWRtYV9idWZfZmQyID0gcHJp bWVfaGFuZGxlX3RvX2ZkKGZkMiwgaGFuZGxlX29wZW4pOwogCWhhbmRsZV9pbXBvcnQgPSBwcmlt ZV9mZF90b19oYW5kbGUoZmQyLCBkbWFfYnVmX2ZkMik7CiAKLQkvKiBkbWEtYnVmIHNlbGZpbXBv cnRpbmcgYW4gZmxpbmsgYm8gc2hvdWxkIGdpdmUgdGhlIHNhbWUgaGFuZGxlICovCisJLyogZG1h LWJ1ZiBzZWxmIGltcG9ydGluZyBhbiBmbGluayBibyBzaG91bGQgZ2l2ZSB0aGUgc2FtZSBoYW5k bGUgKi8KIAlpZ3RfYXNzZXJ0X2VxX3UzMihoYW5kbGVfaW1wb3J0LCBoYW5kbGVfb3Blbik7CiAK IAljbG9zZShmZDEpOwpAQCAtMjI2LDYgKzIyNiwzMyBAQCBzdGF0aWMgaW50IGdldF9vYmplY3Rf Y291bnQodm9pZCkKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgaW50IGdldF9zdGFibGVfb2Jq X2NvdW50KGludCBkcml2ZXIpCit7CisJLyogVGhlIHRlc3QgcmVsaWVzIG9uIHRoZSBzeXN0ZW0g YmVpbmcgaW4gdGhlIHNhbWUgc3RhdGUgYmVmb3JlIGFuZAorCSAgIGFmdGVyIHRoZSB0ZXN0IHNv IGFueSBkaWZmZXJlbmNlIGluIHRoZSBvYmplY3QgY291bnQgaXMgYSByZXN1bHQgb2YKKwkgICBs ZWFrcyBkdXJpbmcgdGhlIHRlc3QuIGdlbV9xdWllc2NlbnRfZ3B1KCkgbW9zdGx5IGFjaGlldmVz IHRoaXMgYnV0CisJICAgb2NjYXNpb25hbGx5IG9ial9jb3VudCBjYW4gc3RpbGwgY2hhbmdlLiBU aGUgbG9vcCBlbnN1cmVzIG9ial9jb3VudAorCSAgIGhhcyByZW1haW5lZCBzdGFibGUgb3ZlciBz ZXZlcmFsIGNoZWNrcyAqLworCWludCBvYmpfY291bnQsIHByZXZfb2JqX2NvdW50OworCWludCBs b29wX2NvdW50ID0gMDsKKwlnZW1fcXVpZXNjZW50X2dwdShkcml2ZXIpOworCXByZXZfb2JqX2Nv dW50ID0gZ2V0X29iamVjdF9jb3VudCgpOworCXdoaWxlIChsb29wX2NvdW50IDwgNCkgeworCQl1 c2xlZXAoMjAwMDAwKTsKKwkJZ2VtX3F1aWVzY2VudF9ncHUoZHJpdmVyKTsKKwkJb2JqX2NvdW50 ID0gZ2V0X29iamVjdF9jb3VudCgpOworCQlpZiAob2JqX2NvdW50ID09IHByZXZfb2JqX2NvdW50 KSB7CisJCQlsb29wX2NvdW50Kys7CisJCX0gZWxzZSB7CisJCQlpZ3RfZGVidWcoImxvb3BfY291 bnQ9JWQsIG9ial9jb3VudD0lZCwgcHJldl9vYmpfY291bnQ9JWRcbiIsIGxvb3BfY291bnQsIG9i al9jb3VudCwgcHJldl9vYmpfY291bnQpOworCQkJbG9vcF9jb3VudCA9IDA7CisJCQlwcmV2X29i al9jb3VudCA9IG9ial9jb3VudDsKKwkJfQorCisJfQorCXJldHVybiBvYmpfY291bnQ7Cit9CisK IHN0YXRpYyB2b2lkICp0aHJlYWRfZm5fcmVpbXBvcnRfdnNfY2xvc2Uodm9pZCAqcCkKIHsKIAlz dHJ1Y3QgZHJtX2dlbV9jbG9zZSBjbG9zZV9ibzsKQEAgLTI1OCw4ICsyODUsNyBAQCBzdGF0aWMg dm9pZCB0ZXN0X3JlaW1wb3J0X2Nsb3NlX3JhY2Uodm9pZCkKIAkgKiB1cCB0aGUgY291bnRzICov CiAJZmFrZSA9IGRybV9vcGVuX2RyaXZlcihEUklWRVJfSU5URUwpOwogCi0JZ2VtX3F1aWVzY2Vu dF9ncHUoZmFrZSk7Ci0Jb2JqX2NvdW50ID0gZ2V0X29iamVjdF9jb3VudCgpOworCW9ial9jb3Vu dCA9IGdldF9zdGFibGVfb2JqX2NvdW50KGZha2UpOwogCiAJbnVtX3RocmVhZHMgPSBzeXNjb25m KF9TQ19OUFJPQ0VTU09SU19PTkxOKTsKIApAQCAtMjkwLDggKzMxNiw3IEBAIHN0YXRpYyB2b2lk IHRlc3RfcmVpbXBvcnRfY2xvc2VfcmFjZSh2b2lkKQogCWNsb3NlKGZkc1swXSk7CiAJY2xvc2Uo ZmRzWzFdKTsKIAotCWdlbV9xdWllc2NlbnRfZ3B1KGZha2UpOwotCW9ial9jb3VudCA9IGdldF9v YmplY3RfY291bnQoKSAtIG9ial9jb3VudDsKKwlvYmpfY291bnQgPSBnZXRfc3RhYmxlX29ial9j b3VudChmYWtlKSAtIG9ial9jb3VudDsKIAogCWlndF9pbmZvKCJsZWFrZWQgJWkgb2JqZWN0c1xu Iiwgb2JqX2NvdW50KTsKIApAQCAtMzUwLDggKzM3NSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfZXhw b3J0X2Nsb3NlX3JhY2Uodm9pZCkKIAkgKiB1cCB0aGUgY291bnRzICovCiAJZmFrZSA9IGRybV9v cGVuX2RyaXZlcihEUklWRVJfSU5URUwpOwogCi0JZ2VtX3F1aWVzY2VudF9ncHUoZmFrZSk7Ci0J b2JqX2NvdW50ID0gZ2V0X29iamVjdF9jb3VudCgpOworCW9ial9jb3VudCA9IGdldF9zdGFibGVf b2JqX2NvdW50KGZha2UpOwogCiAJZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJVkVSX0lOVEVMKTsK IApAQCAtMzczLDggKzM5Nyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfZXhwb3J0X2Nsb3NlX3JhY2Uo dm9pZCkKIAogCWNsb3NlKGZkKTsKIAotCWdlbV9xdWllc2NlbnRfZ3B1KGZha2UpOwotCW9ial9j b3VudCA9IGdldF9vYmplY3RfY291bnQoKSAtIG9ial9jb3VudDsKKwlvYmpfY291bnQgPSBnZXRf c3RhYmxlX29ial9jb3VudChmYWtlKSAtIG9ial9jb3VudDsKIAogCWlndF9pbmZvKCJsZWFrZWQg JWkgb2JqZWN0c1xuIiwgb2JqX2NvdW50KTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==