From: Derek Morton Subject: [PATCH i-g-t v2 7/7] gem_scheduler: Added subtests to test priority bumping Date: Wed, 2 Mar 2016 18:10:45 +0000 Message-ID: <1456942245-24749-8-git-send-email-derek.j.morton@intel.com> References: <1456942245-24749-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 305226E948 for ; Wed, 2 Mar 2016 18:11:12 +0000 (UTC) In-Reply-To: <1456942245-24749-1-git-send-email-derek.j.morton@intel.com> 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: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org V2hlbiBhIGhpZ2hlciBwcmlvcml0eSBiYXRjaCBidWZmZXIgYnVtcHMgYSBsb3dlciBwcmlvcml0 eSBiYXRjaApidWZmZXIgYWxsIGJhdGNoIGJ1ZmZlcnMgaW4gdGhlIHNjaGVkdWxlciBxdWV1ZSBn ZXQgYSBzbWFsbCBwcmlvcml0eQppbmNyZWFzZS4gQWRkZWQgYSBzdWJ0ZXN0IHRvIGNoZWNrIHRo aXMgYmVoYXZpb3VyLgoKUmVxdWVzdGVkIGJ5IEpvb25hcyBMYWh0aW5lbiBkdXJpbmcgc2NoZWR1 bGVyIGNvZGUgcmV2aWV3CgpTaWduZWQtb2ZmLWJ5OiBEZXJlayBNb3J0b24gPGRlcmVrLmoubW9y dG9uQGludGVsLmNvbT4KLS0tCiB0ZXN0cy9nZW1fc2NoZWR1bGVyLmMgfCAxMzQgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2Vk LCAxMzQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV9zY2hlZHVsZXIuYyBi L3Rlc3RzL2dlbV9zY2hlZHVsZXIuYwppbmRleCAxNzFiMGEzLi4wZTJhNGI0IDEwMDY0NAotLS0g YS90ZXN0cy9nZW1fc2NoZWR1bGVyLmMKKysrIGIvdGVzdHMvZ2VtX3NjaGVkdWxlci5jCkBAIC0y NDYsNiArMjQ2LDEzNCBAQCBzdGF0aWMgdm9pZCBydW5fdGVzdF9iYXNpYyhpbnQgaW5fZmxpZ2h0 LCBpbnQgcmluZ2lkLCBpbnQgcHJpb3JpdHkpCiAJZnJlZShpbl9mbGlnaHRfYmJzKTsKIH0KIAor CisvKiBUZXN0IHByaW9yaXR5IGJ1bXAgYmVoYXZpb3VyLgorICogV2hlbiBhIGJhdGNoIGJ1ZmZl ciBpcyBidW1wZWQgYnkgYSBoaWdoZXIgcHJpb3JpdHkgYmF0Y2ggYnVmZmVyIGFsbCBvdGhlcgor ICogYmF0Y2ggYnVmZmVycyBpbiB0aGUgc2NoZWR1bGVyIHF1ZXVlIGdldCB0aGVpciBwcmlvcml0 eSBpbmNyZWFzZWQgc2xpZ2h0bHkuCisgKiBTdWJtaXQgdHdvIGRlbGF5IGJhdGNoIGJ1ZmZlcnMg dGhlbiBmaWxsIHRoZSBpbiBmbGlnaHQgcXVldWUuIFN1Ym1pdCBhCisgKiBzbGlnaHRseSByZWR1 Y2VkIHByaW9yaXR5IGJhdGNoIGJ1ZmZlciBhbmQgYSBub3JtYWwgcHJpb3JpdHkgYmF0Y2ggYnVm ZmVyLgorICogV2hlbiB0aGUgZmlyc3QgZGVsYXkgYmF0Y2ggYnVmZmVyIGNvbXBsZXRlcyBwcmlv cml0eSBidW1waW5nIHNob3VsZCBvY2N1ci4KKyAqIFN1Ym1pdCBhbm90aGVyIG5vcm1hbCBwcmlv cml0eSBiYXRjaCBidWZmZXIuIEl0IHNob3VsZCBub3Qgb3ZlcnRha2UgdGhlCisgKiByZWR1Y2Vk IHByaW9yaXR5IGJhdGNoIGJ1ZmZlciBhcyBpdHMgcHJpb3JpdHkgaGFzIGJlZW4gYnVtcGVkLgor ICovCisjZGVmaW5lIE5CUl9QUklPX0JVTVBfRkRzICg0KQorc3RhdGljIHZvaWQgcnVuX3Rlc3Rf cHJpb3JpdHlfYnVtcChpbnQgaW5fZmxpZ2h0LCBpbnQgcmluZ2lkKQoreworCWludCBmZFtOQlJf UFJJT19CVU1QX0ZEc107CisJaW50IGxvb3A7CisJZHJtX2ludGVsX2J1Zm1nciAqYnVmbWdyW05C Ul9QUklPX0JVTVBfRkRzXTsKKwl1aW50MzJfdCAqZGVsYXlfYnVmLCAqZGVsYXkyX2J1ZiwgKnRz MV9idWYsICp0czJfYnVmLCAqdHMzX2J1ZjsKKwlzdHJ1Y3QgaW50ZWxfYmF0Y2hidWZmZXIgKnRz MV9iYiwgKnRzMl9iYiwgKnRzM19iYjsKKwlzdHJ1Y3QgaW50ZWxfYmF0Y2hidWZmZXIgKippbl9m bGlnaHRfYmJzOworCXVpbnQzMl90IGNhbGlicmF0ZWRfMXM7CisJZHJtX2ludGVsX2JvICpkZWxh eV9ibywgKmRlbGF5Ml9ibyAsKnRzMV9ibywgKnRzMl9ibywgKnRzM19ibzsKKworCWluX2ZsaWdo dF9iYnMgPSBtYWxsb2MoaW5fZmxpZ2h0ICogc2l6ZW9mKHN0cnVjdCBpbnRlbF9iYXRjaGJ1ZmZl ciAqKSk7CisJaWd0X2Fzc2VydChpbl9mbGlnaHRfYmJzKTsKKworCS8qIE5lZWQgbXVsdGlwbGUg aTkxNSBmZCdzLiBTY2hlZHVsZXIgd2lsbCBub3QgY2hhbmdlIGV4ZWN1dGlvbiBvcmRlciBvZgor CSAqIGJhdGNoIGJ1ZmZlcnMgZnJvbSB0aGUgc2FtZSBjb250ZXh0LgorCSAqLworCWZvcihsb29w PTA7IGxvb3AgPCBOQlJfUFJJT19CVU1QX0ZEczsgbG9vcCsrKQorCQlpbml0X2NvbnRleHQoJihm ZFtsb29wXSksICYoYnVmbWdyW2xvb3BdKSwgcmluZ2lkKTsKKworCS8qIExvd2VyIHByaW9yaXR5 IG9mIGZpcnN0IHRpbWVzdGFtcCBiYXRjaCBidWZmZXIKKwkgKiBTZWNvbmQgdGltZXN0YW1wIGJh dGNoIGJ1ZmZlciBzaG91bGQgb3ZlcnRha2UgdGhlIGZpcnN0CisJICogU2Vjb25kIHNob3VsZCB0 aGVuIGdldCBidW1wZWQgc28gdGhlIHRoaXJkIGRvZXMgbm90IG92ZXJ0YWtlIGl0CisJICovCisJ c2V0X3ByaW9yaXR5KGZkWzFdLCAtMSk7CisKKwkvKiBDcmVhdGUgYnVmZmVyIG9iamVjdHMgKi8K KwlkZWxheV9ibyA9IGNyZWF0ZV9hbmRfY2hlY2tfYm8oYnVmbWdyWzBdLCAiZGVsYXkgYm8iKTsK KwlkZWxheTJfYm8gPSBjcmVhdGVfYW5kX2NoZWNrX2JvKGJ1Zm1nclswXSwgImRlbGF5IGJvMiIp OworCXRzMV9ibyA9IGNyZWF0ZV9hbmRfY2hlY2tfYm8oYnVmbWdyWzFdLCAidHMxIGJvIik7CisJ dHMyX2JvID0gY3JlYXRlX2FuZF9jaGVja19ibyhidWZtZ3JbMl0sICJ0czIgYm8iKTsKKwl0czNf Ym8gPSBjcmVhdGVfYW5kX2NoZWNrX2JvKGJ1Zm1nclszXSwgInRzMjMgYm8iKTsKKworCS8qIFB1 dCBzb21lIG5vbiB6ZXJvIHZhbHVlcyBpbiB0aGUgZGVsYXkgYm8gKi8KKwl7CisJCXVpbnQzMl90 IGRhdGE9MHhmZmZmZmZmZjsKKwkJZHJtX2ludGVsX2JvX3N1YmRhdGEoZGVsYXlfYm8sIDAsIDQs ICZkYXRhKTsKKwkJZHJtX2ludGVsX2JvX3N1YmRhdGEoZGVsYXkyX2JvLCAwLCA0LCAmZGF0YSk7 CisJfQorCisJY2FsaWJyYXRlZF8xcyA9IGlndF9jYWxpYnJhdGVfZGVsYXlfYmIoZmRbMF0sIGJ1 Zm1nclswXSwgcmluZ2lkKTsKKworCS8qIEJhdGNoIGJ1ZmZlcnMgdG8gZmlsbCB0aGUgaW4gZmxp Z2h0IHF1ZXVlICovCisJaW5fZmxpZ2h0X2Jic1swXSA9IGNyZWF0ZV9kZWxheV9iYihmZFswXSwg YnVmbWdyWzBdLCByaW5naWQsIGNhbGlicmF0ZWRfMXMsIGRlbGF5X2JvKTsKKwlpbl9mbGlnaHRf YmJzWzFdID0gY3JlYXRlX2RlbGF5X2JiKGZkWzBdLCBidWZtZ3JbMF0sIHJpbmdpZCwgY2FsaWJy YXRlZF8xcywgZGVsYXkyX2JvKTsKKwlmb3IobG9vcCA9IDI7IGxvb3AgPCBpbl9mbGlnaHQ7IGxv b3ArKykKKwkJaW5fZmxpZ2h0X2Jic1tsb29wXSA9IGNyZWF0ZV9ub29wX2JiKGZkWzBdLCBidWZt Z3JbMF0sIDUpOworCisJLyogRXh0cmEgYmF0Y2ggYnVmZmVycyBpbiB0aGUgc2NoZWR1bGVyIHF1 ZXVlICovCisJdHMxX2JiID0gY3JlYXRlX3RpbWVzdGFtcF9iYihmZFsxXSwgYnVmbWdyWzFdLCBy aW5naWQsIHRzMV9ibywgTlVMTCwgZmFsc2UpOworCXRzMl9iYiA9IGNyZWF0ZV90aW1lc3RhbXBf YmIoZmRbMl0sIGJ1Zm1nclsyXSwgcmluZ2lkLCB0czJfYm8sIE5VTEwsIGZhbHNlKTsKKwl0czNf YmIgPSBjcmVhdGVfdGltZXN0YW1wX2JiKGZkWzNdLCBidWZtZ3JbM10sIHJpbmdpZCwgdHMzX2Jv LCBOVUxMLCBmYWxzZSk7CisKKwkvKiBGbHVzaCBiYXRjaGJ1ZmZlcnMgKi8KKwlmb3IobG9vcCA9 IDA7IGxvb3AgPCBpbl9mbGlnaHQ7IGxvb3ArKykKKwkJaW50ZWxfYmF0Y2hidWZmZXJfZmx1c2hf b25fcmluZyhpbl9mbGlnaHRfYmJzW2xvb3BdLCByaW5naWQpOworCWludGVsX2JhdGNoYnVmZmVy X2ZsdXNoX29uX3JpbmcodHMxX2JiLCByaW5naWQpOworCWludGVsX2JhdGNoYnVmZmVyX2ZsdXNo X29uX3JpbmcodHMyX2JiLCByaW5naWQpOworCisJLyogVGhpcyB3aWxsIG5vdCByZXR1cm4gdW50 aWwgdGhlIGJvIGhhcyBmaW5pc2hlZCBleGVjdXRpbmcgKi8KKwlkcm1faW50ZWxfYm9fbWFwKGRl bGF5X2JvLCAwKTsKKwkvKiBPbmNlIHRoZSBmaXJzdCBkZWxheSBpcyBjb21wbGV0ZSBhbmQgYW55 IGJ1bXBpbmcgaGFzIG9jY3VyZWQsIHN1Ym1pdAorCSAqIHRoZSBmaW5hbCBiYXRjaCBidWZmZXIK KwkgKi8KKwlpbnRlbF9iYXRjaGJ1ZmZlcl9mbHVzaF9vbl9yaW5nKHRzM19iYiwgcmluZ2lkKTsK KworCWRybV9pbnRlbF9ib19tYXAoZGVsYXkyX2JvLCAwKTsKKwlkcm1faW50ZWxfYm9fbWFwKHRz MV9ibywgMCk7CisJZHJtX2ludGVsX2JvX21hcCh0czJfYm8sIDApOworCWRybV9pbnRlbF9ib19t YXAodHMzX2JvLCAwKTsKKworCWRlbGF5X2J1ZiA9IGRlbGF5X2JvLT52aXJ0dWFsOworCWRlbGF5 Ml9idWYgPSBkZWxheTJfYm8tPnZpcnR1YWw7CisJdHMxX2J1ZiA9IHRzMV9iby0+dmlydHVhbDsK Kwl0czJfYnVmID0gdHMyX2JvLT52aXJ0dWFsOworCXRzM19idWYgPSB0czNfYm8tPnZpcnR1YWw7 CisKKwlpZ3RfZGVidWcoIkRlbGF5IFRpbWVzdGFtcCA9IDB4JTA4IiBQUkl4MzIgIlxuIiwgZGVs YXlfYnVmWzJdKTsKKwlpZ3RfZGVidWcoIkRlbGF5IFRpbWVzdGFtcCA9IDB4JTA4IiBQUkl4MzIg IlxuIiwgZGVsYXkyX2J1ZlsyXSk7CisJaWd0X2RlYnVnKCJUUzEgVGltZXN0YW1wID0gMHglMDgi IFBSSXgzMiAiXG4iLCB0czFfYnVmWzBdKTsKKwlpZ3RfZGVidWcoIlRTMiBUaW1lc3RhbXAgPSAw eCUwOCIgUFJJeDMyICJcbiIsIHRzMl9idWZbMF0pOworCWlndF9kZWJ1ZygiVFMzIFRpbWVzdGFt cCA9IDB4JTA4IiBQUkl4MzIgIlxuIiwgdHMzX2J1ZlswXSk7CisKKwkvKiBidWZbMF0gaW4gdGhl IHRhcmdldCBidWZmZXIgc2hvdWxkIGJlIDAgaWYgdGhlIGJhdGNoIGJ1ZmZlciBjb21wbGV0ZWQg Ki8KKwlpZ3RfYXNzZXJ0X2YoZGVsYXlfYnVmWzBdID09IDAsCisJICAgICAgICAgICAgICJkZWxh eV9idWZbMF0gZXhwZWN0ZWQgMHgwLCBnb3QgMHglIiBQUkl4MzIgIlxuIiwgZGVsYXlfYnVmWzBd KTsKKworCWlndF9hc3NlcnRfZihpZ3RfY29tcGFyZV90aW1lc3RhbXBzKGRlbGF5X2J1ZlsyXSwg dHMxX2J1ZlswXSksCisJICAgICAgICAgICAgICJEZWxheSB0cyAoMHglMDgiIFBSSXgzMiAiKSA+ IFRTMSB0cyAoMHglMDgiIFBSSXgzMiAiKVxuIiwKKwkgICAgICAgICAgICAgZGVsYXlfYnVmWzJd LCB0czFfYnVmWzBdKTsKKworCWlndF9hc3NlcnRfZihpZ3RfY29tcGFyZV90aW1lc3RhbXBzKHRz Ml9idWZbMF0sIHRzMV9idWZbMF0pLAorCSAgICAgICAgICAgICAiVFMyIHRzICgweCUwOCIgUFJJ eDMyICIpID4gVFMxIHRzICgweCUwOCIgUFJJeDMyICIpXG4iLAorCSAgICAgICAgICAgICB0czJf YnVmWzBdLCB0czFfYnVmWzBdKTsKKworCWlndF9hc3NlcnRfZihpZ3RfY29tcGFyZV90aW1lc3Rh bXBzKHRzMV9idWZbMF0sIHRzM19idWZbMF0pLAorCSAgICAgICAgICAgICAiVFMxIHRzICgweCUw OCIgUFJJeDMyICIpID4gVFMzIHRzICgweCUwOCIgUFJJeDMyICIpXG4iLAorCSAgICAgICAgICAg ICB0czFfYnVmWzBdLCB0czNfYnVmWzBdKTsKKworCS8qIENsZWFudXAgKi8KKwlmb3IobG9vcCA9 IDA7IGxvb3AgPCBpbl9mbGlnaHQ7IGxvb3ArKykKKwkJaW50ZWxfYmF0Y2hidWZmZXJfZnJlZShp bl9mbGlnaHRfYmJzW2xvb3BdKTsKKwlpbnRlbF9iYXRjaGJ1ZmZlcl9mcmVlKHRzMV9iYik7CisJ aW50ZWxfYmF0Y2hidWZmZXJfZnJlZSh0czJfYmIpOworCisJZHJtX2ludGVsX2JvX3VucmVmZXJl bmNlKGRlbGF5X2JvKTsKKwlkcm1faW50ZWxfYm9fdW5yZWZlcmVuY2UoZGVsYXkyX2JvKTsKKwlk cm1faW50ZWxfYm9fdW5yZWZlcmVuY2UodHMxX2JvKTsKKwlkcm1faW50ZWxfYm9fdW5yZWZlcmVu Y2UodHMyX2JvKTsKKwlkcm1faW50ZWxfYm9fdW5yZWZlcmVuY2UodHMzX2JvKTsKKwlmb3IobG9v cCA9IDA7IGxvb3AgPCBOQlJfUFJJT19CVU1QX0ZEczsgbG9vcCsrKSB7CisJCWRybV9pbnRlbF9i dWZtZ3JfZGVzdHJveShidWZtZ3JbbG9vcF0pOworCQljbG9zZShmZFtsb29wXSk7CisJfQorCWZy ZWUoaW5fZmxpZ2h0X2Jicyk7Cit9CisKIC8qIERlcGVuZGVuY3kgdGVzdC4KICAqIHdyaXRlPTAs IFN1Ym1pdCBiYXRjaCBidWZmZXJzIHdpdGggcmVhZCBkZXBlbmRlbmNpZXMgdG8gYWxsIHJpbmdz LiBEZWxheSBvbmUKICAqIHdpdGggYSBsb25nIGV4ZWN1dGluZyBiYXRjaCBidWZmZXIuIENoZWNr IHRoZSBvdGhlcnMgYXJlIG5vdCBoZWxkIHVwLgpAQCAtNDgyLDYgKzYxMCwxMiBAQCBpZ3RfbWFp bgogCQkJcnVuX3Rlc3RfZGVwZW5kZW5jeShpbl9mbGlnaHQsIGxvb3AsIHRydWUpOwogCQl9CiAK Kwlmb3IgKGxvb3A9MDsgbG9vcCA8IE5CUl9SSU5HUzsgbG9vcCsrKQorCQlpZ3Rfc3VidGVzdF9m KCIlcy1wcmlvcml0eS1idW1wIiwgcmluZ3NbbG9vcF0ubmFtZSkgeworCQkJZ2VtX3JlcXVpcmVf cmluZyhmZCwgcmluZ3NbbG9vcF0uaWQpOworCQkJcnVuX3Rlc3RfcHJpb3JpdHlfYnVtcChpbl9m bGlnaHQsIHJpbmdzW2xvb3BdLmlkKTsKKwkJfQorCiAJaWd0X2ZpeHR1cmUgewogCQljbG9zZShm ZCk7CiAJfQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=