116716 2013-05-24 03:32:19 -0700 [sh4] Optimize LLINT generated code and few bug fixes in baseline JIT 2013-05-24 09:45:54 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 jbriance webkit-unassigned commit-queue fpizlo ggaren mark.lam oliver oldest_to_newest 893254 0 jbriance 2013-05-24 03:32:19 -0700 Optimize LLINT generated code for sh4 backend and fix few bugs in sh4 baseline JIT. 893255 1 202799 jbriance 2013-05-24 03:34:49 -0700 Created attachment 202799 SH4 LLINT optimizations and fix few bugs in baseline JIT 893272 2 jbriance 2013-05-24 05:36:57 -0700 I've tested this patch on r150629 and I didn't see regressions when running - Tools/Scripts/run-javascriptcore-tests - Tools/Scripts/run-fast-jsc - SunSpider 1.0 SunSpider 1.0 results for r150629 without patch: ============================================ RESULTS (means and 95% confidence intervals) -------------------------------------------- Total: 13334.4ms +/- 0.3% -------------------------------------------- 3d: 2666.0ms +/- 0.3% cube: 827.0ms +/- 0.6% morph: 450.3ms +/- 0.9% raytrace: 1388.8ms +/- 0.3% access: 1977.4ms +/- 1.3% binary-trees: 138.1ms +/- 0.7% fannkuch: 1193.5ms +/- 2.4% nbody: 464.9ms +/- 1.2% nsieve: 180.9ms +/- 1.4% bitops: 1058.3ms +/- 0.3% 3bit-bits-in-byte: 94.3ms +/- 2.1% bits-in-byte: 121.8ms +/- 0.3% bitwise-and: 202.1ms +/- 0.1% nsieve-bits: 640.1ms +/- 0.4% controlflow: 103.3ms +/- 0.4% recursive: 103.3ms +/- 0.4% crypto: 1156.4ms +/- 0.2% aes: 663.8ms +/- 0.5% md5: 315.8ms +/- 0.9% sha1: 176.9ms +/- 0.4% date: 2085.5ms +/- 0.6% format-tofte: 942.9ms +/- 0.4% format-xparb: 1142.6ms +/- 1.1% math: 990.9ms +/- 1.3% cordic: 289.8ms +/- 0.9% partial-sums: 414.6ms +/- 3.1% spectral-norm: 286.5ms +/- 0.9% regexp: 533.1ms +/- 0.5% dna: 533.1ms +/- 0.5% string: 2763.6ms +/- 0.5% base64: 227.9ms +/- 1.9% fasta: 423.1ms +/- 0.7% tagcloud: 593.1ms +/- 0.8% unpack-code: 1186.6ms +/- 0.9% validate-input: 332.9ms +/- 1.0% SunSpider 1.0 results for r150629 with patch: ============================================ RESULTS (means and 95% confidence intervals) -------------------------------------------- Total: 12966.6ms +/- 0.3% -------------------------------------------- 3d: 2606.0ms +/- 0.7% cube: 816.5ms +/- 0.3% morph: 453.6ms +/- 0.5% raytrace: 1335.9ms +/- 1.4% access: 1945.9ms +/- 0.4% binary-trees: 122.9ms +/- 1.5% fannkuch: 1183.3ms +/- 0.8% nbody: 456.1ms +/- 0.4% nsieve: 183.6ms +/- 0.9% bitops: 1036.0ms +/- 0.3% 3bit-bits-in-byte: 79.5ms +/- 0.6% bits-in-byte: 111.9ms +/- 1.6% bitwise-and: 201.0ms +/- 0.0% nsieve-bits: 643.6ms +/- 0.5% controlflow: 74.8ms +/- 1.0% recursive: 74.8ms +/- 1.0% crypto: 1156.6ms +/- 0.6% aes: 685.5ms +/- 0.4% md5: 299.9ms +/- 1.9% sha1: 171.3ms +/- 4.5% date: 1985.1ms +/- 0.7% format-tofte: 913.5ms +/- 0.6% format-xparb: 1071.6ms +/- 1.3% math: 891.5ms +/- 1.4% cordic: 272.0ms +/- 0.9% partial-sums: 354.1ms +/- 3.4% spectral-norm: 265.4ms +/- 0.4% regexp: 533.4ms +/- 0.4% dna: 533.4ms +/- 0.4% string: 2737.4ms +/- 1.0% base64: 220.4ms +/- 3.0% fasta: 440.8ms +/- 5.9% tagcloud: 553.8ms +/- 2.0% unpack-code: 1178.4ms +/- 0.9% validate-input: 344.1ms +/- 2.2% 893329 3 202799 ggaren 2013-05-24 09:23:10 -0700 Comment on attachment 202799 SH4 LLINT optimizations and fix few bugs in baseline JIT r=me 893335 4 202799 commit-queue 2013-05-24 09:45:52 -0700 Comment on attachment 202799 SH4 LLINT optimizations and fix few bugs in baseline JIT Clearing flags on attachment: 202799 Committed r150644: <http://trac.webkit.org/changeset/150644> 893336 5 commit-queue 2013-05-24 09:45:54 -0700 All reviewed patches have been landed. Closing bug. 202799 2013-05-24 03:34:49 -0700 2013-05-24 09:45:52 -0700 SH4 LLINT optimizations and fix few bugs in baseline JIT bug-116716.patch text/plain 12998 jbriance SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUwNjM2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBA CisyMDEzLTA1LTI0ICBKdWxpZW4gQnJpYW5jZWF1ICA8amJyaWFuY2VhdUBuZHMuY29tPgorCisg ICAgICAgIFtzaDRdIE9wdGltaXplIExMSU5UIGdlbmVyYXRlZCBjb2RlIGFuZCBmaXggZmV3IGJ1 Z3MgaW4gYmFzZWxpbmUgSklULgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE2NzE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJTSDQuaDoKKyAgICAgICAgKEpT Qzo6TWFjcm9Bc3NlbWJsZXJTSDQ6Om11bDMyKTogQ29zbWV0aWMgY2hhbmdlcy4KKyAgICAgICAg KEpTQzo6TWFjcm9Bc3NlbWJsZXJTSDQ6OmNvbnZlcnRJbnQzMlRvRG91YmxlKTogQWJzb2x1dGUg YWRkcmVzcyB3YXMgbm90IGRlcmVmZXJlbmNlZC4KKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJs ZXJTSDQ6OmJyYW5jaDMyKTogQWJzb2x1dGUgYWRkcmVzcyB3YXMgbm90IGRlcmVmZXJlbmNlZC4K KyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJTSDQ6OnJldmVydEp1bXBSZXBsYWNlbWVudFRv QnJhbmNoUHRyV2l0aFBhdGNoKTogVXNlIGFsbCAzMiBiaXRzIG9mIHBvaW50ZXIgZm9yIHJldmVy dEp1bXAgY2FsbC4KKyAgICAgICAgKiBhc3NlbWJsZXIvU0g0QXNzZW1ibGVyLmg6CisgICAgICAg IChKU0M6OlNINEFzc2VtYmxlcjo6cmV2ZXJ0SnVtcCk6IFVzZSBjaGFuZ2VQQ3JlbGF0aXZlQWRk cmVzcyB0byBwYXRjaCB0aGUgd2hvbGUgcG9pbnRlci4KKyAgICAgICAgKEpTQzo6U0g0QXNzZW1i bGVyOjpsaW5rSnVtcCk6IENvc21ldGljIGNoYW5nZS4KKyAgICAgICAgKiBvZmZsaW5lYXNtL3No NC5yYjogT3B0aW1pemUgTExJTlQgZ2VuZXJhdGVkIGNvZGUuCisKIDIwMTMtMDUtMjMgIFBldGVy IFdhbmcgIDxwZXRlci53YW5nQHRvcmNobW9iaWxlLmNvbS5jbj4KIAogICAgICAgICBDTG9vcCBs bGludCBiYWNrZW5kIHNob3VsZCBub3QgdXNlIHRoZSBkOCByZWdpc3RlciBhcyBzY3JhdGNoIHJl Z2lzdGVyCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyU0g0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9N YWNyb0Fzc2VtYmxlclNINC5oCShyZXZpc2lvbiAxNTA2MjkpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyU0g0LmgJKHdvcmtpbmcgY29weSkKQEAgLTIz Miw5ICsyMzIsOSBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBSZWdpc3RlcklEIHNjciA9IGNs YWltU2NyYXRjaCgpOwogICAgICAgICBtb3ZlKGltbSwgc2NyKTsKLSAgICAgICAgaWYgIChzcmMg IT0gZGVzdCkKKyAgICAgICAgaWYgKHNyYyAhPSBkZXN0KQogICAgICAgICAgICAgbW92ZShzcmMs IGRlc3QpOwotICAgICAgICBtdWwzMihzY3IsICBkZXN0KTsKKyAgICAgICAgbXVsMzIoc2NyLCBk ZXN0KTsKICAgICAgICAgcmVsZWFzZVNjcmF0Y2goc2NyKTsKICAgICB9CiAKQEAgLTExMzcsNyAr MTEzNyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNvbnZlcnRJbnQzMlRvRG91YmxlKEFic29sdXRl QWRkcmVzcyBzcmMsIEZQUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKICAgICAgICAgUmVnaXN0ZXJJ RCBzY3IgPSBjbGFpbVNjcmF0Y2goKTsKLSAgICAgICAgbV9hc3NlbWJsZXIubG9hZENvbnN0YW50 KHJlaW50ZXJwcmV0X2Nhc3Q8dWludDMyX3Q+KHNyYy5tX3B0ciksIHNjcik7CisgICAgICAgIGxv YWQzMihzcmMubV9wdHIsIHNjcik7CiAgICAgICAgIGNvbnZlcnRJbnQzMlRvRG91YmxlKHNjciwg ZGVzdCk7CiAgICAgICAgIHJlbGVhc2VTY3JhdGNoKHNjcik7CiAgICAgfQpAQCAtMTY2MSw3ICsx NjYxLDcgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgUmVnaXN0ZXJJRCBzY3IgPSBjbGFpbVNj cmF0Y2goKTsKIAotICAgICAgICBtb3ZlKFRydXN0ZWRJbW0zMihyZWludGVycHJldF9jYXN0PHVp bnQzMl90PihsZWZ0Lm1fcHRyKSksIHNjcik7CisgICAgICAgIGxvYWQzMihsZWZ0Lm1fcHRyLCBz Y3IpOwogICAgICAgICBtX2Fzc2VtYmxlci5jbXBsUmVnUmVnKHJpZ2h0LCBzY3IsIFNINENvbmRp dGlvbihjb25kKSk7CiAgICAgICAgIHJlbGVhc2VTY3JhdGNoKHNjcik7CiAKQEAgLTIxOTIsNyAr MjE5Miw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyB2b2lkIHJldmVydEp1bXBSZXBsYWNlbWVu dFRvQnJhbmNoUHRyV2l0aFBhdGNoKENvZGVMb2NhdGlvbkxhYmVsIGluc3RydWN0aW9uU3RhcnQs IFJlZ2lzdGVySUQsIHZvaWQqIGluaXRpYWxWYWx1ZSkKICAgICB7Ci0gICAgICAgIFNINEFzc2Vt Ymxlcjo6cmV2ZXJ0SnVtcChpbnN0cnVjdGlvblN0YXJ0LmRhdGFMb2NhdGlvbigpLCByZWludGVy cHJldF9jYXN0PHVpbnRwdHJfdD4oaW5pdGlhbFZhbHVlKSAmIDB4ZmZmZik7CisgICAgICAgIFNI NEFzc2VtYmxlcjo6cmV2ZXJ0SnVtcChpbnN0cnVjdGlvblN0YXJ0LmRhdGFMb2NhdGlvbigpLCBp bml0aWFsVmFsdWUpOwogICAgIH0KIAogICAgIHN0YXRpYyBDb2RlTG9jYXRpb25MYWJlbCBzdGFy dE9mUGF0Y2hhYmxlQnJhbmNoUHRyV2l0aFBhdGNoT25BZGRyZXNzKENvZGVMb2NhdGlvbkRhdGFM YWJlbFB0cikKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvU0g0QXNzZW1i bGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9TSDRB c3NlbWJsZXIuaAkocmV2aXNpb24gMTUwNjI5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Fz c2VtYmxlci9TSDRBc3NlbWJsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTUyOCwxOCArMTUyOCwx MSBAQCBwdWJsaWM6CiAgICAgICAgIGNhY2hlRmx1c2goaW5zdHJ1Y3Rpb24sIHNpemVvZihTSDRX b3JkKSAqIG5iaW5zdCk7CiAgICAgfQogCi0gICAgc3RhdGljIHZvaWQgcmV2ZXJ0SnVtcCh2b2lk KiBpbnN0cnVjdGlvblN0YXJ0LCBTSDRXb3JkIGltbSkKKyAgICBzdGF0aWMgdm9pZCByZXZlcnRK dW1wKHZvaWQqIGluc3RydWN0aW9uU3RhcnQsIHZvaWQgKmltbXB0cikKICAgICB7CiAgICAgICAg IFNINFdvcmQgKmluc24gPSByZWludGVycHJldF9jYXN0PFNINFdvcmQqPihpbnN0cnVjdGlvblN0 YXJ0KTsKLSAgICAgICAgU0g0V29yZCBkaXNwOwotCiAgICAgICAgIEFTU0VSVCgoaW5zblswXSAm IDB4ZjAwMCkgPT0gTU9WTF9SRUFEX09GRlBDX09QQ09ERSk7Ci0KLSAgICAgICAgZGlzcCA9IGlu c25bMF0gJiAweDAwZmY7Ci0gICAgICAgIGluc24gKz0gMiArIChkaXNwIDw8IDEpOyAvLyBQQyAr PSA0ICsgKGRpc3AqNCkKLSAgICAgICAgaW5zbiA9IChTSDRXb3JkICopICgodW5zaWduZWQpIGlu c24gJiAofjMpKTsKLSAgICAgICAgaW5zblswXSA9IGltbTsKLSAgICAgICAgY2FjaGVGbHVzaChp bnNuLCBzaXplb2YoU0g0V29yZCkpOworICAgICAgICBjaGFuZ2VQQ3JlbGF0aXZlQWRkcmVzcyhp bnNuWzBdICYgMHgwMGZmLCBpbnNuLCByZWludGVycHJldF9jYXN0PHVpbnQzMl90PihpbW1wdHIp KTsKICAgICB9CiAKICAgICB2b2lkIGxpbmtKdW1wKEFzc2VtYmxlckxhYmVsIGZyb20sIEFzc2Vt YmxlckxhYmVsIHRvLCBKdW1wVHlwZSB0eXBlID0gSnVtcEZhcikKQEAgLTE1OTMsNyArMTU4Niw3 IEBAIHB1YmxpYzoKICAgICAgICAgfQogCiAgICAgICAgIGluc3RydWN0aW9uID0gKmluc3RydWN0 aW9uUHRyOwotICAgICAgICBpZiAoKGluc3RydWN0aW9uICAmIDB4ZjAwMCkgPT0gMHhlMDAwKSB7 CisgICAgICAgIGlmICgoaW5zdHJ1Y3Rpb24gJiAweGYwMDApID09IDB4ZTAwMCkgewogICAgICAg ICAgICAgdWludDMyX3QqIGFkZHIgPSBnZXRMZHJJbW1BZGRyZXNzT25Qb29sKGluc3RydWN0aW9u UHRyLCBtX2J1ZmZlci5wb29sQWRkcmVzcygpKTsKICAgICAgICAgICAgICphZGRyID0gb2Zmc2V0 Qml0cyAtIDI7CiAgICAgICAgICAgICBwcmludEluc3RyKCppbnN0cnVjdGlvblB0ciwgZnJvbS5t X29mZnNldCArIDIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vc2g0 LnJiCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3NoNC5y YgkocmV2aXNpb24gMTUwNjI5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v c2g0LnJiCSh3b3JraW5nIGNvcHkpCkBAIC0zMTgsMTMgKzMxOCwyNSBAQCBkZWYgc2g0TG93ZXJE b3VibGVTcGVjaWFscyhsaXN0KQogICAgICAgICB8IG5vZGUgfAogICAgICAgICBpZiBub2RlLmlz X2E/IEluc3RydWN0aW9uCiAgICAgICAgICAgICBjYXNlIG5vZGUub3Bjb2RlCi0gICAgICAgICAg ICB3aGVuICJiZG5lcXVuIiwgImJkZ3RlcXVuIiwgImJkbHR1biIsICJiZGx0ZXF1biIsICJiZGd0 dW4iCi0gICAgICAgICAgICAgICAgIyBIYW5kbGUgZmxvYXRpbmcgcG9pbnQgdW5vcmRlcmVkIG9w Y29kZXMuCisgICAgICAgICAgICB3aGVuICJiZGx0dW4iLCAiYmRndHVuIgorICAgICAgICAgICAg ICAgICMgSGFuZGxlIHNwZWNpZmljIGZsb2F0aW5nIHBvaW50IHVub3JkZXJlZCBvcGNvZGVzLgog ICAgICAgICAgICAgICAgIHRtcDEgPSBUbXAubmV3KGNvZGVPcmlnaW4sIDpncHIpCiAgICAgICAg ICAgICAgICAgdG1wMiA9IFRtcC5uZXcoY29kZU9yaWdpbiwgOmdwcikKICAgICAgICAgICAgICAg ICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhjb2RlT3JpZ2luLCAiYmRuYW4iLCBbbm9kZS5v cGVyYW5kc1swXSwgbm9kZS5vcGVyYW5kc1syXSwgdG1wMSwgdG1wMl0pCiAgICAgICAgICAgICAg ICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgImJkbmFuIiwgW25vZGUu b3BlcmFuZHNbMV0sIG5vZGUub3BlcmFuZHNbMl0sIHRtcDEsIHRtcDJdKQogICAgICAgICAgICAg ICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVPcmlnaW4sIG5vZGUub3Bjb2RlWzAu Li0zXSwgbm9kZS5vcGVyYW5kcykKKyAgICAgICAgICAgIHdoZW4gImJkbmVxdW4iLCAiYmRndGVx dW4iLCAiYmRsdGVxdW4iCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5u ZXcoY29kZU9yaWdpbiwgbm9kZS5vcGNvZGVbMC4uLTNdLCBub2RlLm9wZXJhbmRzKQorICAgICAg ICAgICAgd2hlbiAiYmRuZXEiLCAiYmRndGVxIiwgImJkbHRlcSIKKyAgICAgICAgICAgICAgICAj IEhhbmRsZSBzcGVjaWZpYyBmbG9hdGluZyBwb2ludCBvcmRlcmVkIG9wY29kZXMuCisgICAgICAg ICAgICAgICAgdG1wMSA9IFRtcC5uZXcoY29kZU9yaWdpbiwgOmdwcikKKyAgICAgICAgICAgICAg ICB0bXAyID0gVG1wLm5ldyhjb2RlT3JpZ2luLCA6Z3ByKQorICAgICAgICAgICAgICAgIG91dGxh YmVsID0gTG9jYWxMYWJlbC51bmlxdWUoIm91dF8je25vZGUub3Bjb2RlfSIpCisgICAgICAgICAg ICAgICAgb3V0cmVmID0gTG9jYWxMYWJlbFJlZmVyZW5jZS5uZXcoY29kZU9yaWdpbiwgb3V0bGFi ZWwpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdp biwgImJkbmFuIiwgW25vZGUub3BlcmFuZHNbMF0sIG91dHJlZiwgdG1wMSwgdG1wMl0pCisgICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgImJkbmFu IiwgW25vZGUub3BlcmFuZHNbMV0sIG91dHJlZiwgdG1wMSwgdG1wMl0pCisgICAgICAgICAgICAg ICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgbm9kZS5vcGNvZGUsIG5v ZGUub3BlcmFuZHMpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBvdXRsYWJlbAogICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZQogICAgICAgICAgICAg ZW5kCkBAIC00MjksMjIgKzQ0MSw0NiBAQCBkZWYgc2g0T3BlcmFuZHMob3BlcmFuZHMpCiAgICAg b3BlcmFuZHMubWFwe3x2fCB2LnNoNE9wZXJhbmR9LmpvaW4oIiwgIikKIGVuZAogCi1kZWYgZW1p dFNINExvYWRDb25zdGFudChjb25zdGFudCwgb3BlcmFuZCkKLSAgICBpZiBjb25zdGFudCA9PSAw eDQwMDAwMDAwCitkZWYgZW1pdFNINExvYWQzMihjb25zdGFudCwgZGVzdCkKKyAgICBvdXRsYWJl bCA9IExvY2FsTGFiZWwudW5pcXVlKCJsb2FkMzJvdXQiKQorICAgIGNvbnN0bGFiZWwgPSBMb2Nh bExhYmVsLnVuaXF1ZSgibG9hZDMyY29uc3QiKQorICAgICRhc20ucHV0cyAibW92LmwgI3tMb2Nh bExhYmVsUmVmZXJlbmNlLm5ldyhjb2RlT3JpZ2luLCBjb25zdGxhYmVsKS5hc21MYWJlbH0sICN7 ZGVzdC5zaDRPcGVyYW5kfSIKKyAgICAkYXNtLnB1dHMgImJyYSAje0xvY2FsTGFiZWxSZWZlcmVu Y2UubmV3KGNvZGVPcmlnaW4sIG91dGxhYmVsKS5hc21MYWJlbH0iCisgICAgJGFzbS5wdXRzICJu b3AiCisgICAgJGFzbS5wdXRzICIuYmFsaWduIDQiCisgICAgY29uc3RsYWJlbC5sb3dlcigiU0g0 IikKKyAgICAkYXNtLnB1dHMgIi5sb25nICN7Y29uc3RhbnR9IgorICAgIG91dGxhYmVsLmxvd2Vy KCJTSDQiKQorZW5kCisKK2RlZiBlbWl0U0g0TG9hZDMyQW5kSnVtcChjb25zdGFudCwgc2NyYXRj aCkKKyAgICBjb25zdGxhYmVsID0gTG9jYWxMYWJlbC51bmlxdWUoImxvYWQzMmNvbnN0IikKKyAg ICAkYXNtLnB1dHMgIm1vdi5sICN7TG9jYWxMYWJlbFJlZmVyZW5jZS5uZXcoY29kZU9yaWdpbiwg Y29uc3RsYWJlbCkuYXNtTGFiZWx9LCAje3NjcmF0Y2guc2g0T3BlcmFuZH0iCisgICAgJGFzbS5w dXRzICJqbXAgQCN7c2NyYXRjaC5zaDRPcGVyYW5kfSIKKyAgICAkYXNtLnB1dHMgIm5vcCIKKyAg ICAkYXNtLnB1dHMgIi5iYWxpZ24gNCIKKyAgICBjb25zdGxhYmVsLmxvd2VyKCJTSDQiKQorICAg ICRhc20ucHV0cyAiLmxvbmcgI3tjb25zdGFudH0iCitlbmQKKworZGVmIGVtaXRTSDRMb2FkSW1t KG9wZXJhbmRzKQorICAgIGlmIG9wZXJhbmRzWzBdLnZhbHVlID09IDB4NDAwMDAwMDAKICAgICAg ICAgIyBGaXJzdENvbnN0YW50UmVnaXN0ZXJJbmRleCBjb25zdCBpcyBvZnRlbiB1c2VkICgweDQw MDAwMDAwKS4KICAgICAgICAgIyBJdCdzIG1vcmUgZWZmaWNpZW50IHRvICJidWlsZCIgdGhlIHZh bHVlIHdpdGggMyBvcGNvZGVzIHdpdGhvdXQgYnJhbmNoLgotICAgICAgICAkYXNtLnB1dHMgIm1v diAjNjQsICN7b3BlcmFuZC5zaDRPcGVyYW5kfSIKLSAgICAgICAgJGFzbS5wdXRzICJzaGxsMTYg I3tvcGVyYW5kLnNoNE9wZXJhbmR9IgotICAgICAgICAkYXNtLnB1dHMgInNobGw4ICN7b3BlcmFu ZC5zaDRPcGVyYW5kfSIKLSAgICBlbHNlCisgICAgICAgICRhc20ucHV0cyAibW92ICM2NCwgI3tv cGVyYW5kc1sxXS5zaDRPcGVyYW5kfSIKKyAgICAgICAgJGFzbS5wdXRzICJzaGxsMTYgI3tvcGVy YW5kc1sxXS5zaDRPcGVyYW5kfSIKKyAgICAgICAgJGFzbS5wdXRzICJzaGxsOCAje29wZXJhbmRz WzFdLnNoNE9wZXJhbmR9IgorICAgIGVsc2lmICgtMTI4Li4xMjcpLmluY2x1ZGU/IG9wZXJhbmRz WzBdLnZhbHVlCisgICAgICAgICRhc20ucHV0cyAibW92ICN7c2g0T3BlcmFuZHMob3BlcmFuZHMp fSIKKyAgICBlbHNpZiAoLTMyNzY4Li4zMjc2NykuaW5jbHVkZT8gb3BlcmFuZHNbMF0udmFsdWUK ICAgICAgICAgY29uc3RsYWJlbCA9IExvY2FsTGFiZWwudW5pcXVlKCJsb2FkY29uc3RhbnQiKQot ICAgICAgICAkYXNtLnB1dHMgIi5iYWxpZ24gNCIKLSAgICAgICAgJGFzbS5wdXRzICJtb3YubCBA KDgsIFBDKSwgI3tvcGVyYW5kLnNoNE9wZXJhbmR9IgorICAgICAgICAkYXNtLnB1dHMgIm1vdi53 IEAoNiwgUEMpLCAje29wZXJhbmRzWzFdLnNoNE9wZXJhbmR9IgogICAgICAgICAkYXNtLnB1dHMg ImJyYSAje0xvY2FsTGFiZWxSZWZlcmVuY2UubmV3KGNvZGVPcmlnaW4sIGNvbnN0bGFiZWwpLmFz bUxhYmVsfSIKICAgICAgICAgJGFzbS5wdXRzICJub3AiCi0gICAgICAgICRhc20ucHV0cyAibm9w IgotICAgICAgICAkYXNtLnB1dHMgIi5sb25nICN7Y29uc3RhbnR9IgorICAgICAgICAkYXNtLnB1 dHMgIi53b3JkICN7b3BlcmFuZHNbMF0udmFsdWV9IgogICAgICAgICBjb25zdGxhYmVsLmxvd2Vy KCJTSDQiKQorICAgIGVsc2UKKyAgICAgICAgZW1pdFNINExvYWQzMihvcGVyYW5kc1swXS52YWx1 ZSwgb3BlcmFuZHNbMV0pCiAgICAgZW5kCiBlbmQKIApAQCAtNDgwLDEyICs1MTYsNyBAQCBkZWYg ZW1pdFNINEJyYW5jaElmVChsYWJlbCwgbmVnKQogICAgICAgICAkYXNtLnB1dHMgImJyYSAje2xh YmVsLmFzbUxhYmVsfSIKICAgICAgICAgJGFzbS5wdXRzICJub3AiCiAgICAgZWxzZQotICAgICAg ICAkYXNtLnB1dHMgIi5iYWxpZ24gNCIKLSAgICAgICAgJGFzbS5wdXRzICJtb3YubCBAKDgsIFBD KSwgI3tTSDRfVE1QX0dQUlNbMF0uc2g0T3BlcmFuZH0iCi0gICAgICAgICRhc20ucHV0cyAiam1w IEAje1NINF9UTVBfR1BSU1swXS5zaDRPcGVyYW5kfSIKLSAgICAgICAgJGFzbS5wdXRzICJub3Ai Ci0gICAgICAgICRhc20ucHV0cyAibm9wIgotICAgICAgICAkYXNtLnB1dHMgIi5sb25nICN7bGFi ZWwuYXNtTGFiZWx9IgorICAgICAgICBlbWl0U0g0TG9hZDMyQW5kSnVtcChsYWJlbC5hc21MYWJl bCwgU0g0X1RNUF9HUFJTWzBdKQogICAgIGVuZAogICAgIG91dGxhYmVsLmxvd2VyKCJTSDQiKQog ZW5kCkBAIC01MTksNDMgKzU1MCw0MyBAQCBkZWYgZW1pdFNINEJyYW5jaElmTmFOKG9wZXJhbmRz KQogICAgIHNjcm1hc2sgPSBvcGVyYW5kc1syXQogICAgIHNjcmludCA9IG9wZXJhbmRzWzNdCiAK LSAgICAjIElmIHdlIGRvbid0IGhhdmUgIkUgPSBFbWF4ICsgMSIsIGl0J3Mgbm90IGEgTmFOLgog ICAgIG5vdE5hTmxhYmVsID0gTG9jYWxMYWJlbC51bmlxdWUoIm5vdG5hbiIpCisgICAgbm90TmFO cmVmID0gTG9jYWxMYWJlbFJlZmVyZW5jZS5uZXcoY29kZU9yaWdpbiwgbm90TmFObGFiZWwpCisg ICAgY29uc3RsYWJlbDEgPSBMb2NhbExhYmVsLnVuaXF1ZSgibm90bmFuQ29uc3QxIikKKyAgICBj b25zdGxhYmVsMiA9IExvY2FsTGFiZWwudW5pcXVlKCJub3RuYW5Db25zdDIiKQorCisgICAgIyBJ ZiB3ZSBkb24ndCBoYXZlICJFID0gRW1heCArIDEiLCBpdCdzIG5vdCBhIE5hTi4KICAgICAkYXNt LnB1dHMgImZjbnZkcyAje2RibG9wLnNoNE9wZXJhbmR9LCBmcHVsIgogICAgICRhc20ucHV0cyAi c3RzIGZwdWwsICN7c2NyaW50LnNoNE9wZXJhbmR9IgotICAgIGVtaXRTSDRMb2FkQ29uc3RhbnQo MHg3ZjgwMDAwMCwgc2NybWFzaykKKyAgICAkYXNtLnB1dHMgIm1vdi5sICN7TG9jYWxMYWJlbFJl ZmVyZW5jZS5uZXcoY29kZU9yaWdpbiwgY29uc3RsYWJlbDEpLmFzbUxhYmVsfSwgI3tzY3JtYXNr LnNoNE9wZXJhbmR9IgogICAgICRhc20ucHV0cyAiYW5kICN7c2g0T3BlcmFuZHMoW3Njcm1hc2ss IHNjcmludF0pfSIKICAgICAkYXNtLnB1dHMgImNtcC9lcSAje3NoNE9wZXJhbmRzKFtzY3JtYXNr LCBzY3JpbnRdKX0iCi0gICAgJGFzbS5wdXRzICJiZiAje0xvY2FsTGFiZWxSZWZlcmVuY2UubmV3 KGNvZGVPcmlnaW4sIG5vdE5hTmxhYmVsKS5hc21MYWJlbH0iCisgICAgJGFzbS5wdXRzICJiZiAj e25vdE5hTnJlZi5hc21MYWJlbH0iCiAKICAgICAjIElmIHdlIGhhdmUgIkUgPSBFbWF4ICsgMSIg YW5kICJmICE9IDAiLCB0aGVuIGl0J3MgYSBOYU4uCiAgICAgJGFzbS5wdXRzICJzdHMgZnB1bCwg I3tzY3JpbnQuc2g0T3BlcmFuZH0iCi0gICAgZW1pdFNINExvYWRDb25zdGFudCgweDAwM2ZmZmZm LCBzY3JtYXNrKQorICAgICRhc20ucHV0cyAibW92LmwgI3tMb2NhbExhYmVsUmVmZXJlbmNlLm5l dyhjb2RlT3JpZ2luLCBjb25zdGxhYmVsMikuYXNtTGFiZWx9LCAje3Njcm1hc2suc2g0T3BlcmFu ZH0iCiAgICAgJGFzbS5wdXRzICJ0c3QgI3tzaDRPcGVyYW5kcyhbc2NybWFzaywgc2NyaW50XSl9 IgotICAgICRhc20ucHV0cyAiYmYgI3tsYWJlbG9wLmFzbUxhYmVsfSIKKyAgICAkYXNtLnB1dHMg ImJ0ICN7bm90TmFOcmVmLmFzbUxhYmVsfSIKKyAgICAkYXNtLnB1dHMgImJyYSAje2xhYmVsb3Au YXNtTGFiZWx9IgorICAgICRhc20ucHV0cyAibm9wIgorCisgICAgJGFzbS5wdXRzICIuYmFsaWdu IDQiCisgICAgY29uc3RsYWJlbDEubG93ZXIoIlNINCIpCisgICAgJGFzbS5wdXRzICIubG9uZyAw eDdmODAwMDAwIgorICAgIGNvbnN0bGFiZWwyLmxvd2VyKCJTSDQiKQorICAgICRhc20ucHV0cyAi LmxvbmcgMHgwMDNmZmZmZiIKIAogICAgIG5vdE5hTmxhYmVsLmxvd2VyKCJTSDQiKQogZW5kCiAK IGRlZiBlbWl0U0g0RG91YmxlQ29uZEJyYW5jaChjbXBPcGNvZGUsIG5lZywgb3BlcmFuZHMpCiAg ICAgaWYgY21wT3Bjb2RlID09ICJsdCIKLSAgICAgICAgaWYgIW5lZwotICAgICAgICAgICAgb3V0 bGFiZWwgPSBMb2NhbExhYmVsLnVuaXF1ZSgiZGNib3V0IikKLSAgICAgICAgICAgICRhc20ucHV0 cyAiZmNtcC9ndCAje3NoNE9wZXJhbmRzKFtvcGVyYW5kc1sxXSwgb3BlcmFuZHNbMF1dKX0iCi0g ICAgICAgICAgICAkYXNtLnB1dHMgImJ0ICN7TG9jYWxMYWJlbFJlZmVyZW5jZS5uZXcoY29kZU9y aWdpbiwgb3V0bGFiZWwpLmFzbUxhYmVsfSIKLSAgICAgICAgICAgICRhc20ucHV0cyAiZmNtcC9l cSAje3NoNE9wZXJhbmRzKFtvcGVyYW5kc1sxXSwgb3BlcmFuZHNbMF1dKX0iCi0gICAgICAgICAg ICAkYXNtLnB1dHMgImJmICN7b3BlcmFuZHNbMl0uYXNtTGFiZWx9IgotICAgICAgICAgICAgb3V0 bGFiZWwubG93ZXIoIlNINCIpCi0gICAgICAgIGVsc2UKLSAgICAgICAgICAgICRhc20ucHV0cyAi ZmNtcC9ndCAje3NoNE9wZXJhbmRzKFtvcGVyYW5kc1sxXSwgb3BlcmFuZHNbMF1dKX0iCi0gICAg ICAgICAgICAkYXNtLnB1dHMgImJ0ICN7b3BlcmFuZHNbMl0uYXNtTGFiZWx9IgotICAgICAgICAg ICAgJGFzbS5wdXRzICJmY21wL2VxICN7c2g0T3BlcmFuZHMoW29wZXJhbmRzWzFdLCBvcGVyYW5k c1swXV0pfSIKLSAgICAgICAgICAgICRhc20ucHV0cyAiYnQgI3tvcGVyYW5kc1syXS5hc21MYWJl bH0iCi0gICAgICAgIGVuZAorICAgICAgICAkYXNtLnB1dHMgImZjbXAvZ3QgI3tzaDRPcGVyYW5k cyhbb3BlcmFuZHNbMF0sIG9wZXJhbmRzWzFdXSl9IgogICAgIGVsc2UKICAgICAgICAgJGFzbS5w dXRzICJmY21wLyN7Y21wT3Bjb2RlfSAje3NoNE9wZXJhbmRzKFtvcGVyYW5kc1sxXSwgb3BlcmFu ZHNbMF1dKX0iCi0gICAgICAgIGVtaXRTSDRCcmFuY2hJZlQob3BlcmFuZHNbMl0sIG5lZykKICAg ICBlbmQKKyAgICBlbWl0U0g0QnJhbmNoSWZUKG9wZXJhbmRzWzJdLCBuZWcpCiBlbmQKIAogY2xh c3MgSW5zdHJ1Y3Rpb24KQEAgLTcyOCwxMiArNzU5LDcgQEAgY2xhc3MgSW5zdHJ1Y3Rpb24KICAg ICAgICAgICAgICAgICByYWlzZSAiVW5oYW5kbGVkIHBhcmFtZXRlcnMgZm9yIG9wY29kZSAje29w Y29kZX0gYXQgI3tjb2RlT3JpZ2luU3RyaW5nfSIKICAgICAgICAgICAgIGVuZAogICAgICAgICB3 aGVuICJqbXBmIgotICAgICAgICAgICAgJGFzbS5wdXRzICIuYmFsaWduIDQiCi0gICAgICAgICAg ICAkYXNtLnB1dHMgIm1vdi5sIEAoOCwgUEMpLCAje29wZXJhbmRzWzBdLnNoNE9wZXJhbmR9Igot ICAgICAgICAgICAgJGFzbS5wdXRzICJqbXAgQCN7b3BlcmFuZHNbMF0uc2g0T3BlcmFuZH0iCi0g ICAgICAgICAgICAkYXNtLnB1dHMgIm5vcCIKLSAgICAgICAgICAgICRhc20ucHV0cyAibm9wIgot ICAgICAgICAgICAgJGFzbS5wdXRzICIubG9uZyAje29wZXJhbmRzWzFdLmFzbUxhYmVsfSIKKyAg ICAgICAgICAgIGVtaXRTSDRMb2FkMzJBbmRKdW1wKG9wZXJhbmRzWzFdLmFzbUxhYmVsLCBvcGVy YW5kc1swXSkKICAgICAgICAgd2hlbiAicmV0IgogICAgICAgICAgICAgJGFzbS5wdXRzICJydHMi CiAgICAgICAgICAgICAkYXNtLnB1dHMgIm5vcCIKQEAgLTc0NiwxMCArNzcyLDEwIEBAIGNsYXNz IEluc3RydWN0aW9uCiAgICAgICAgIHdoZW4gImxvYWRpIiwgImxvYWRpcyIsICJsb2FkcCIsICJz dG9yZWkiLCAic3RvcmVwIgogICAgICAgICAgICAgJGFzbS5wdXRzICJtb3YubCAje3NoNE9wZXJh bmRzKG9wZXJhbmRzKX0iCiAgICAgICAgIHdoZW4gIm1vdmUiCi0gICAgICAgICAgICBpZiBvcGVy YW5kc1swXS5pc19hPyBJbW1lZGlhdGUgYW5kIChvcGVyYW5kc1swXS52YWx1ZSA8IC0xMjggb3Ig b3BlcmFuZHNbMF0udmFsdWUgPiAxMjcpCi0gICAgICAgICAgICAgICAgZW1pdFNINExvYWRDb25z dGFudChvcGVyYW5kc1swXS52YWx1ZSwgb3BlcmFuZHNbMV0pCi0gICAgICAgICAgICBlbHNpZiBv cGVyYW5kc1swXS5pc19hPyBMYWJlbFJlZmVyZW5jZQotICAgICAgICAgICAgICAgIGVtaXRTSDRM b2FkQ29uc3RhbnQob3BlcmFuZHNbMF0uYXNtTGFiZWwsIG9wZXJhbmRzWzFdKQorICAgICAgICAg ICAgaWYgb3BlcmFuZHNbMF0uaXNfYT8gTGFiZWxSZWZlcmVuY2UKKyAgICAgICAgICAgICAgICBl bWl0U0g0TG9hZDMyKG9wZXJhbmRzWzBdLmFzbUxhYmVsLCBvcGVyYW5kc1sxXSkKKyAgICAgICAg ICAgIGVsc2lmIG9wZXJhbmRzWzBdLmlzX2E/IEltbWVkaWF0ZQorICAgICAgICAgICAgICAgIGVt aXRTSDRMb2FkSW1tKG9wZXJhbmRzKQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg ICRhc20ucHV0cyAibW92ICN7c2g0T3BlcmFuZHMob3BlcmFuZHMpfSIKICAgICAgICAgICAgIGVu ZAo=