From: Ville Syrjala Subject: [PATCH i-g-t 2/5] tools/intel_watermark: Refactor reg name stuff Date: Tue, 21 Nov 2017 20:49:27 +0200 Message-ID: <20171121184930.25826-2-ville.syrjala@linux.intel.com> References: <20171121184930.25826-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E60B26E588 for ; Tue, 21 Nov 2017 18:49:37 +0000 (UTC) In-Reply-To: <20171121184930.25826-1-ville.syrjala@linux.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: Dhinakaran Pandiyan List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 bGwgdGhlIGNvZGUgdG8gZ2VuZXJhdGUgdGhlIFNLTCByZWdpc3RlciBuYW1lcwppbnRvIHNtYWxs IGhlbHBlciB0byBkZWNsdXR0ZXIgdGhlIG1haW4gY29kZS4KCkNjOiBEaGluYWthcmFuIFBhbmRp eWFuIDxkaGluYWthcmFuLnBhbmRpeWFuQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0 dnJ0a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogdG9vbHMvaW50ZWxfd2F0 ZXJtYXJrLmMgfCA4OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvdG9vbHMvaW50ZWxfd2F0ZXJtYXJrLmMgYi90b29scy9pbnRlbF93YXRl cm1hcmsuYwppbmRleCAxZDA4N2I0OWY4YzIuLmJiNzc2ZmIzZDUzMiAxMDA2NDQKLS0tIGEvdG9v bHMvaW50ZWxfd2F0ZXJtYXJrLmMKKysrIGIvdG9vbHMvaW50ZWxfd2F0ZXJtYXJrLmMKQEAgLTE1 Miw2ICsxNTIsNTcgQEAgc3RhdGljIGludCBza2xfbWF4X3BsYW5lcyh1aW50MzJfdCBkKQogCQly ZXR1cm4gNDsKIH0KIAorc3RhdGljIGNvbnN0IGNoYXIgKnNrbF93bV9saW5ldGltZV9yZWdfbmFt ZShpbnQgcGlwZSkKK3sKKwlzdGF0aWMgY2hhciByZWdfbmFtZVszMl07CisKKwlzbnByaW50Zihy ZWdfbmFtZSwgc2l6ZW9mKHJlZ19uYW1lKSwgIldNX0xJTkVUSU1FXyVjIiwKKwkJIHBpcGVfbmFt ZShwaXBlKSk7CisKKwlyZXR1cm4gcmVnX25hbWU7Cit9CisKK3N0YXRpYyBjb25zdCBjaGFyICpz a2xfd21fcmVnX25hbWUoaW50IHBpcGUsIGludCBwbGFuZSwgaW50IGxldmVsKQoreworCXN0YXRp YyBjaGFyIHJlZ19uYW1lWzMyXTsKKworCWlmIChwbGFuZSA9PSAwKQorCQlzbnByaW50ZihyZWdf bmFtZSwgc2l6ZW9mKHJlZ19uYW1lKSwgIkNVUl9XTV8lY18lMWQiLAorCQkJIHBpcGVfbmFtZShw aXBlKSwgbGV2ZWwpOworCWVsc2UKKwkJc25wcmludGYocmVnX25hbWUsIHNpemVvZihyZWdfbmFt ZSksICJQTEFORV9XTV8lMWRfJWNfJTFkIiwKKwkJCSBwbGFuZSwgcGlwZV9uYW1lKHBpcGUpLCBs ZXZlbCk7CisKKwlyZXR1cm4gcmVnX25hbWU7Cit9CisKK3N0YXRpYyBjb25zdCBjaGFyICpza2xf d21fdHJhbnNfcmVnX25hbWUoaW50IHBpcGUsIGludCBwbGFuZSkKK3sKKwlzdGF0aWMgY2hhciBy ZWdfbmFtZVszMl07CisKKwlpZiAocGxhbmUgPT0gMCkKKwkJc25wcmludGYocmVnX25hbWUsIHNp emVvZihyZWdfbmFtZSksICJDVVJfV01fVFJBTlNfJWMiLAorCQkJIHBpcGVfbmFtZShwaXBlKSk7 CisJZWxzZQorCQlzbnByaW50ZihyZWdfbmFtZSwgc2l6ZW9mKHJlZ19uYW1lKSwgIlBMQU5FX1dN X1RSQU5TXyUxZF8lYyIsCisJCQkgcGxhbmUsIHBpcGVfbmFtZShwaXBlKSk7CisJcmV0dXJuIHJl Z19uYW1lOworfQorCitzdGF0aWMgY29uc3QgY2hhciAqc2tsX2J1Zl9jZmdfcmVnX25hbWUoaW50 IHBpcGUsIGludCBwbGFuZSkKK3sKKwlzdGF0aWMgY2hhciByZWdfbmFtZVszMl07CisKKwlpZiAo cGxhbmUgPT0gMCkKKwkJc25wcmludGYocmVnX25hbWUsIHNpemVvZihyZWdfbmFtZSksICJDVVJf QlVGX0NGR18lYyIsCisJCQkgcGlwZV9uYW1lKHBpcGUpKTsKKwllbHNlCisJCXNucHJpbnRmKHJl Z19uYW1lLCBzaXplb2YocmVnX25hbWUpLCAiUExBTkVfQlVGX0NGR18lMWRfJWMiLAorCQkJIHBs YW5lLCBwaXBlX25hbWUocGlwZSkpOworCisJcmV0dXJuIHJlZ19uYW1lOworfQorCiBzdGF0aWMg dm9pZCBza2xfd21fZHVtcCh2b2lkKQogewogCWludCBwaXBlLCBwbGFuZSwgbGV2ZWw7CkBAIC0x NjMsNyArMjE0LDYgQEAgc3RhdGljIHZvaWQgc2tsX3dtX2R1bXAodm9pZCkKIAl1aW50MzJfdCB3 bV90cmFuc1tudW1fcGlwZXNdW21heF9wbGFuZXNdOwogCXVpbnQzMl90IGJ1Zl9jZmdbbnVtX3Bp cGVzXVttYXhfcGxhbmVzXTsKIAl1aW50MzJfdCB3bV9saW5ldGltZVtudW1fcGlwZXNdOwotCWNo YXIgcmVnX25hbWVbMzJdOwogCiAJaW50ZWxfcmVnaXN0ZXJfYWNjZXNzX2luaXQoaW50ZWxfZ2V0 X3BjaV9kZXZpY2UoKSwgMCwgLTEpOwogCkBAIC0xODUsOSArMjM1LDkgQEAgc3RhdGljIHZvaWQg c2tsX3dtX2R1bXAodm9pZCkKIAl9CiAKIAlmb3IgKHBpcGUgPSAwOyBwaXBlIDwgbnVtX3BpcGVz OyBwaXBlKyspIHsKLQkJc25wcmludGYocmVnX25hbWUsIHNpemVvZihyZWdfbmFtZSksICJXTV9M SU5FVElNRV8lYyIsCi0JCQkgcGlwZV9uYW1lKHBpcGUpKTsKLQkJcHJpbnRmKCIlLTE4cyAweCUw OHhcdCIsIHJlZ19uYW1lLCB3bV9saW5ldGltZVtwaXBlXSk7CisJCXByaW50ZigiJS0xOHMgMHgl MDh4XHQiLAorCQkgICAgICAgc2tsX3dtX2xpbmV0aW1lX3JlZ19uYW1lKHBpcGUpLAorCQkgICAg ICAgd21fbGluZXRpbWVbcGlwZV0pOwogCX0KIAlwcmludGYoIlxuXG4iKTsKIApAQCAtMTk2LDE0 ICsyNDYsMTAgQEAgc3RhdGljIHZvaWQgc2tsX3dtX2R1bXAodm9pZCkKIAkJCWZvciAocGlwZSA9 IDA7IHBpcGUgPCBudW1fcGlwZXM7IHBpcGUrKykgewogCQkJCWlmIChwbGFuZSA+PSBza2xfbnVt X3BsYW5lcyhkZXZpZCwgcGlwZSkpCiAJCQkJCWJyZWFrOwotCQkJCWlmIChwbGFuZSA9PSAwKQot CQkJCQlzbnByaW50ZihyZWdfbmFtZSwgc2l6ZW9mKHJlZ19uYW1lKSwgIkNVUl9XTV8lY18lMWQi LAotCQkJCQkJIHBpcGVfbmFtZShwaXBlKSwgbGV2ZWwpOwotCQkJCWVsc2UKLQkJCQkJc25wcmlu dGYocmVnX25hbWUsIHNpemVvZihyZWdfbmFtZSksICJQTEFORV9XTV8lMWRfJWNfJTFkIiwKLQkJ CQkJCSBwbGFuZSwgcGlwZV9uYW1lKHBpcGUpLCBsZXZlbCk7CiAKLQkJCQlwcmludGYoIiUtMThz IDB4JTA4eFx0IiAsIHJlZ19uYW1lLCB3bVtsZXZlbF1bcGlwZV1bcGxhbmVdKTsKKwkJCQlwcmlu dGYoIiUtMThzIDB4JTA4eFx0IiAsCisJCQkJICAgICAgIHNrbF93bV9yZWdfbmFtZShwaXBlLCBw bGFuZSwgbGV2ZWwpLAorCQkJCSAgICAgICB3bVtsZXZlbF1bcGlwZV1bcGxhbmVdKTsKIAkJCX0K IAkJCXByaW50ZigiXG4iKTsKIAkJfQpAQCAtMjE0LDE0ICsyNjAsMTAgQEAgc3RhdGljIHZvaWQg c2tsX3dtX2R1bXAodm9pZCkKIAkJZm9yIChwaXBlID0gMDsgcGlwZSA8IG51bV9waXBlczsgcGlw ZSsrKSB7CiAJCQlpZiAocGxhbmUgPj0gc2tsX251bV9wbGFuZXMoZGV2aWQsIHBpcGUpKQogCQkJ CWJyZWFrOwotCQkJaWYgKHBsYW5lID09IDApCi0JCQkJc25wcmludGYocmVnX25hbWUsIHNpemVv ZihyZWdfbmFtZSksICJDVVJfV01fVFJBTlNfJWMiLAotCQkJCQkgcGlwZV9uYW1lKHBpcGUpKTsK LQkJCWVsc2UKLQkJCQlzbnByaW50ZihyZWdfbmFtZSwgc2l6ZW9mKHJlZ19uYW1lKSwgIlBMQU5F X1dNX1RSQU5TXyUxZF8lYyIsCi0JCQkJCSBwbGFuZSwgcGlwZV9uYW1lKHBpcGUpKTsKIAotCQkJ cHJpbnRmKCIlLTE4cyAweCUwOHhcdCIsIHJlZ19uYW1lLCB3bV90cmFuc1twaXBlXVtwbGFuZV0p OworCQkJcHJpbnRmKCIlLTE4cyAweCUwOHhcdCIsCisJCQkgICAgICAgc2tsX3dtX3RyYW5zX3Jl Z19uYW1lKHBpcGUsIHBsYW5lKSwKKwkJCSAgICAgICB3bV90cmFuc1twaXBlXVtwbGFuZV0pOwog CQl9CiAJCXByaW50ZigiXG4iKTsKIAl9CkBAIC0yMzEsMTQgKzI3MywxMCBAQCBzdGF0aWMgdm9p ZCBza2xfd21fZHVtcCh2b2lkKQogCQlmb3IgKHBpcGUgPSAwOyBwaXBlIDwgbnVtX3BpcGVzOyBw aXBlKyspIHsKIAkJCWlmIChwbGFuZSA+PSBza2xfbnVtX3BsYW5lcyhkZXZpZCwgcGlwZSkpCiAJ CQkJYnJlYWs7Ci0JCQlpZiAocGxhbmUgPT0gMCkKLQkJCQlzbnByaW50ZihyZWdfbmFtZSwgc2l6 ZW9mKHJlZ19uYW1lKSwgIkNVUl9CVUZfQ0ZHXyVjIiwKLQkJCQkJIHBpcGVfbmFtZShwaXBlKSk7 Ci0JCQllbHNlCi0JCQkJc25wcmludGYocmVnX25hbWUsIHNpemVvZihyZWdfbmFtZSksICJQTEFO RV9CVUZfQ0ZHXyUxZF8lYyIsCi0JCQkJCSBwbGFuZSwgcGlwZV9uYW1lKHBpcGUpKTsKIAotCQkJ cHJpbnRmKCIlLTE4cyAweCUwOHhcdCIsIHJlZ19uYW1lLCBidWZfY2ZnW3BpcGVdW3BsYW5lXSk7 CisJCQlwcmludGYoIiUtMThzIDB4JTA4eFx0IiwKKwkJCSAgICAgICBza2xfYnVmX2NmZ19yZWdf bmFtZShwaXBlLCBwbGFuZSksCisJCQkgICAgICAgYnVmX2NmZ1twaXBlXVtwbGFuZV0pOwogCQl9 CiAJCXByaW50ZigiXG4iKTsKIAl9Ci0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=