From: Chris Wilson Subject: [PATCH igt 04/24] igt/gem_exec_schedule: Do not overcommit batches to the ring Date: Mon, 14 Aug 2017 21:18:28 +0100 Message-ID: <20170814201848.28216-4-chris@chris-wilson.co.uk> References: <20170814201848.28216-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEFDC6E215 for ; Mon, 14 Aug 2017 20:19:02 +0000 (UTC) In-Reply-To: <20170814201848.28216-1-chris@chris-wilson.co.uk> 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 TWVhc3VyZSB0aGUgcmluZ19zaXplIHNvIHdlIGRvbid0IG92ZXJmaWxsIGl0IGFuZCBibG9jayB1 bnRpbCB0aGUgR1BVCmhhbmdzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+Ci0tLQogdGVzdHMvZ2VtX2V4ZWNfc2NoZWR1bGUuYyB8IDk5ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNzggaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVz dHMvZ2VtX2V4ZWNfc2NoZWR1bGUuYyBiL3Rlc3RzL2dlbV9leGVjX3NjaGVkdWxlLmMKaW5kZXgg NTQ1ZGNjMmUuLjIyYTViNzA0IDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fZXhlY19zY2hlZHVsZS5j CisrKyBiL3Rlc3RzL2dlbV9leGVjX3NjaGVkdWxlLmMKQEAgLTIyLDYgKzIyLDcgQEAKICAqLwog CiAjaW5jbHVkZSA8c3lzL3BvbGwuaD4KKyNpbmNsdWRlIDxzeXMvaW9jdGwuaD4KIAogI2luY2x1 ZGUgImlndC5oIgogI2luY2x1ZGUgImlndF92Z2VtLmgiCkBAIC00MzcsNDYgKzQzOCwxMDQgQEAg c3RhdGljIHZvaWQgZGVlcChpbnQgZmQsIHVuc2lnbmVkIHJpbmcpCiAjdW5kZWYgWFMKIH0KIAor c3RhdGljIHZvaWQgYWxhcm1faGFuZGxlcihpbnQgc2lnKQoreworfQorCitzdGF0aWMgaW50IF9f ZXhlY2J1ZihpbnQgZmQsIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmV4ZWNidWYp Cit7CisJcmV0dXJuIGlvY3RsKGZkLCBEUk1fSU9DVExfSTkxNV9HRU1fRVhFQ0JVRkZFUjIsIGV4 ZWNidWYpOworfQorCitzdGF0aWMgdW5zaWduZWQgaW50IG1lYXN1cmVfcmluZ19zaXplKGludCBm ZCwgdW5zaWduZWQgaW50IHJpbmcpCit7CisJc3RydWN0IHNpZ2FjdGlvbiBzYSA9IHsgLnNhX2hh bmRsZXIgPSBhbGFybV9oYW5kbGVyIH07CisJc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVj dDIgb2JqWzJdOworCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgZXhlY2J1ZjsKKwlj b25zdCB1aW50MzJfdCBiYmUgPSBNSV9CQVRDSF9CVUZGRVJfRU5EOworCXVuc2lnbmVkIGludCBj b3VudCwgbGFzdDsKKwlzdHJ1Y3QgaXRpbWVydmFsIGl0djsKKwlzdHJ1Y3QgY29yayBjOworCisJ bWVtc2V0KG9iaiwgMCwgc2l6ZW9mKG9iaikpOworCW9ialsxXS5oYW5kbGUgPSBnZW1fY3JlYXRl KGZkLCA0MDk2KTsKKwlnZW1fd3JpdGUoZmQsIG9ialsxXS5oYW5kbGUsIDAsICZiYmUsIHNpemVv ZihiYmUpKTsKKworCW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6ZW9mKGV4ZWNidWYpKTsKKwlleGVj YnVmLmJ1ZmZlcnNfcHRyID0gdG9fdXNlcl9wb2ludGVyKG9iaiArIDEpOworCWV4ZWNidWYuYnVm ZmVyX2NvdW50ID0gMTsKKwlleGVjYnVmLmZsYWdzID0gcmluZzsKKwlnZW1fZXhlY2J1ZihmZCwg JmV4ZWNidWYpOworCWdlbV9zeW5jKGZkLCBvYmpbMV0uaGFuZGxlKTsKKworCXBsdWcoZmQsICZj KTsKKwlvYmpbMF0uaGFuZGxlID0gYy5oYW5kbGU7CisKKwlleGVjYnVmLmJ1ZmZlcnNfcHRyID0g dG9fdXNlcl9wb2ludGVyKG9iaik7CisJZXhlY2J1Zi5idWZmZXJfY291bnQgPSAyOworCisJc2ln YWN0aW9uKFNJR0FMUk0sICZzYSwgTlVMTCk7CisJaXR2Lml0X2ludGVydmFsLnR2X3NlYyA9IDA7 CisJaXR2Lml0X2ludGVydmFsLnR2X3VzZWMgPSAxMDA7CisJaXR2Lml0X3ZhbHVlLnR2X3NlYyA9 IDA7CisJaXR2Lml0X3ZhbHVlLnR2X3VzZWMgPSAxMDAwOworCXNldGl0aW1lcihJVElNRVJfUkVB TCwgJml0diwgTlVMTCk7CisKKwlsYXN0ID0gLTE7CisJY291bnQgPSAwOworCWRvIHsKKwkJaWYg KF9fZXhlY2J1ZihmZCwgJmV4ZWNidWYpID09IDApIHsKKwkJCWNvdW50Kys7CisJCQljb250aW51 ZTsKKwkJfQorCisJCWlmIChsYXN0ID09IGNvdW50KQorCQkJYnJlYWs7CisKKwkJbGFzdCA9IGNv dW50OworCX0gd2hpbGUgKDEpOworCisJbWVtc2V0KCZpdHYsIDAsIHNpemVvZihpdHYpKTsKKwlz ZXRpdGltZXIoSVRJTUVSX1JFQUwsICZpdHYsIE5VTEwpOworCisJdW5wbHVnKCZjKTsKKwlnZW1f Y2xvc2UoZmQsIG9ialsxXS5oYW5kbGUpOworCisJcmV0dXJuIGNvdW50OworfQorCiBzdGF0aWMg dm9pZCB3aWRlKGludCBmZCwgdW5zaWduZWQgcmluZykKIHsKLSNkZWZpbmUgWFMgMTI4CiAjZGVm aW5lIE5DVFggNDA5NgotCWNvbnN0IHVpbnQzMl90IGJiZSA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7 Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVjdDIgb2JqOwotCXN0cnVjdCBkcm1faTkx NV9nZW1fZXhlY2J1ZmZlcjIgZXhlY2J1ZjsKKwlzdHJ1Y3QgdGltZXNwZWMgdHYgPSB7fTsKKwl1 bnNpZ25lZCBpbnQgcmluZ19zaXplID0gbWVhc3VyZV9yaW5nX3NpemUoZmQsIHJpbmcpOwogCiAJ c3RydWN0IGNvcmsgY29yazsKIAl1aW50MzJfdCByZXN1bHQ7CiAJdWludDMyX3QgKmJ1c3k7CiAJ dWludDMyX3QgKnB0cjsKIAl1aW50MzJfdCAqY3R4OworCXVuc2lnbmVkIGludCBjb3VudDsKIAog CWN0eCA9IG1hbGxvYyhzaXplb2YoKmN0eCkqTkNUWCk7CiAJZm9yIChpbnQgbiA9IDA7IG4gPCBO Q1RYOyBuKyspCiAJCWN0eFtuXSA9IGdlbV9jb250ZXh0X2NyZWF0ZShmZCk7CiAKLQltZW1zZXQo Jm9iaiwgMCwgc2l6ZW9mKG9iaikpOwotCW9iai5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2 KTsKLQlnZW1fd3JpdGUoZmQsIG9iai5oYW5kbGUsIDAsICZiYmUsIHNpemVvZihiYmUpKTsKLQot CW1lbXNldCgmZXhlY2J1ZiwgMCwgc2l6ZW9mKGV4ZWNidWYpKTsKLQlleGVjYnVmLmJ1ZmZlcnNf cHRyID0gdG9fdXNlcl9wb2ludGVyKCZvYmopOwotCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMTsK LQogCXJlc3VsdCA9IGdlbV9jcmVhdGUoZmQsIDQqTkNUWCk7CiAKIAlidXN5ID0gbWFrZV9idXN5 KGZkLCByZXN1bHQsIHJpbmcpOwogCXBsdWcoZmQsICZjb3JrKTsKIAogCS8qIExvdHMgb2YgaW4t b3JkZXIgcmVxdWVzdHMsIHBsdWdnZWQgYW5kIHN1Ym1pdHRlZCBzaW11bHRhbmVvdXNseSAqLwot CWZvciAoaW50IG4gPSAwOyBuIDwgTkNUWDsgbisrKSB7Ci0JCXN0b3JlX2R3b3JkKGZkLCBjdHhb bl0sIHJpbmcsIHJlc3VsdCwgNCpuLCBjdHhbbl0sIGNvcmsuaGFuZGxlLCBJOTE1X0dFTV9ET01B SU5fSU5TVFJVQ1RJT04pOwotCi0JCWV4ZWNidWYucnN2ZDEgPSBjdHhbbl07Ci0JCWV4ZWNidWYu ZmxhZ3MgPSByaW5nOwotCQlmb3IgKGludCBtID0gMDsgbSA8IFhTOyBtKyspCi0JCQlnZW1fZXhl Y2J1ZihmZCwgJmV4ZWNidWYpOworCWZvciAoY291bnQgPSAwOworCSAgICAgaWd0X3NlY29uZHNf ZWxhcHNlZCgmdHYpIDwgNSAmJiBjb3VudCA8IHJpbmdfc2l6ZTsKKwkgICAgIGNvdW50KyspIHsK KwkJZm9yIChpbnQgbiA9IDA7IG4gPCBOQ1RYOyBuKyspIHsKKwkJCXN0b3JlX2R3b3JkKGZkLCBj dHhbbl0sIHJpbmcsIHJlc3VsdCwgNCpuLCBjdHhbbl0sIGNvcmsuaGFuZGxlLCBJOTE1X0dFTV9E T01BSU5fSU5TVFJVQ1RJT04pOworCQl9CiAJfQorCWlndF9pbmZvKCJTdWJtaXR0ZWQgJWQgcmVx dWVzdHMgb3ZlciAlZCBjb250ZXh0cyBpbiAlLjFmbXNcbiIsCisJCSBjb3VudCwgTkNUWCwgaWd0 X25zZWNfZWxhcHNlZCgmdHYpICogMWUtNik7CiAKIAlpZ3RfYXNzZXJ0KGdlbV9ib19idXN5KGZk LCByZXN1bHQpKTsKIAl1bnBsdWcoJmNvcmspOyAvKiBvbmx5IG5vdyBzdWJtaXQgb3VyIGJhdGNo ZXMgKi8KQEAgLTQ5MywxMSArNTUyLDkgQEAgc3RhdGljIHZvaWQgd2lkZShpbnQgZmQsIHVuc2ln bmVkIHJpbmcpCiAJCWlndF9hc3NlcnRfZXFfdTMyKHB0cltuXSwgY3R4W25dKTsKIAltdW5tYXAo cHRyLCA0MDk2KTsKIAotCWdlbV9jbG9zZShmZCwgb2JqLmhhbmRsZSk7CiAJZ2VtX2Nsb3NlKGZk LCByZXN1bHQpOwogCWZyZWUoY3R4KTsKICN1bmRlZiBDVFgKLSN1bmRlZiBYUwogfQogCiBzdGF0 aWMgYm9vbCBoYXNfc2NoZWR1bGVyKGludCBmZCkKLS0gCjIuMTMuMwoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==