156095 2016-03-31 21:37:47 -0700 [JSC][x86] Add the 3 operands form of floating point substraction 2016-04-01 12:20:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue keith_miller mark.lam msaboff saam oldest_to_newest 1179745 0 benjamin 2016-03-31 21:37:47 -0700 [JSC][x86] Add the 3 operands form of floating point substraction 1179748 1 275370 benjamin 2016-03-31 21:51:51 -0700 Created attachment 275370 Patch 1179754 2 benjamin 2016-03-31 22:23:01 -0700 Conf#1 Conf#2 SunSpider: 3d-cube 4.9970+-0.1295 4.9917+-0.1754 3d-morph 5.3338+-0.0866 5.3217+-0.1527 3d-raytrace 5.5747+-0.0451 ? 5.6360+-0.0541 ? might be 1.0110x slower access-binary-trees 2.1744+-0.0456 2.1653+-0.0278 access-fannkuch 5.9211+-0.1037 ? 6.0417+-0.1639 ? might be 1.0204x slower access-nbody 2.5431+-0.0279 ? 2.5847+-0.0812 ? might be 1.0164x slower access-nsieve 3.2416+-0.0835 ? 3.2741+-0.1313 ? might be 1.0100x slower bitops-3bit-bits-in-byte 1.1284+-0.0137 ? 1.1570+-0.0534 ? might be 1.0253x slower bitops-bits-in-byte 2.7648+-0.0324 ? 2.7672+-0.0237 ? bitops-bitwise-and 2.0601+-0.0367 ? 2.1373+-0.0786 ? might be 1.0374x slower bitops-nsieve-bits 3.0945+-0.0179 ? 3.1166+-0.0317 ? controlflow-recursive 2.3816+-0.0336 2.3494+-0.0183 might be 1.0137x faster crypto-aes 4.0685+-0.0934 4.0280+-0.0276 might be 1.0100x faster crypto-md5 2.4896+-0.0161 ? 2.5144+-0.0596 ? crypto-sha1 2.3378+-0.0522 2.3255+-0.0156 date-format-tofte 6.4474+-0.0822 ? 6.5493+-0.2450 ? might be 1.0158x slower date-format-xparb 4.9510+-0.1300 4.9251+-0.0931 math-cordic 2.8579+-0.0865 ? 2.8680+-0.0196 ? math-partial-sums 4.8621+-0.1135 ? 4.8950+-0.1396 ? math-spectral-norm 1.9929+-0.0117 ? 2.0178+-0.0334 ? might be 1.0125x slower regexp-dna 6.3340+-0.1591 ? 6.3446+-0.0875 ? string-base64 4.5489+-0.1775 ? 4.5627+-0.1784 ? string-fasta 5.9884+-0.1140 5.9432+-0.0883 string-tagcloud 8.1668+-0.0777 8.1238+-0.0256 string-unpack-code 19.8111+-0.6574 18.9221+-0.2907 might be 1.0470x faster string-validate-input 4.3708+-0.0211 4.3475+-0.0493 <arithmetic> 4.6324+-0.0317 4.6119+-0.0163 might be 1.0044x faster Conf#1 Conf#2 Octane: encrypt 0.16477+-0.00100 0.16448+-0.00115 decrypt 2.84480+-0.00263 ? 2.84828+-0.00532 ? deltablue x2 0.14104+-0.00110 ? 0.14133+-0.00130 ? earley 0.28699+-0.00136 0.28684+-0.00149 boyer 5.02378+-0.04956 ? 5.03049+-0.03587 ? navier-stokes x2 5.00439+-0.01176 4.99746+-0.01198 raytrace x2 0.89838+-0.00419 ? 0.90220+-0.00350 ? richards x2 0.08295+-0.00075 0.08284+-0.00068 splay x2 0.35417+-0.00249 0.35290+-0.00303 regexp x2 18.76751+-0.07713 ? 19.03021+-0.19185 ? might be 1.0140x slower pdfjs x2 39.46797+-0.39092 39.35072+-0.33608 mandreel x2 42.60600+-0.08343 ? 42.63567+-0.11660 ? gbemu x2 24.29384+-0.18998 24.20727+-0.16128 closure 0.55930+-0.00165 0.55891+-0.00204 jquery 7.23269+-0.01593 ? 7.24100+-0.01952 ? box2d x2 9.26587+-0.03753 ? 9.27044+-0.06774 ? zlib x2 364.33754+-1.71950 359.40654+-4.85495 might be 1.0137x faster typescript x2 642.88659+-4.95458 640.18424+-3.37852 <geometric> 5.17552+-0.00681 5.17235+-0.00896 might be 1.0006x faster Conf#1 Conf#2 Kraken: ai-astar 89.230+-1.300 88.568+-0.872 audio-beat-detection 42.768+-0.453 42.493+-0.073 audio-dft 99.339+-1.040 ? 99.406+-1.083 ? audio-fft 32.832+-0.043 ? 32.882+-0.138 ? audio-oscillator 48.676+-0.646 48.410+-0.061 imaging-darkroom 60.652+-0.715 60.364+-0.290 imaging-desaturate 45.396+-0.192 45.152+-0.131 imaging-gaussian-blur 62.463+-0.863 ? 62.716+-0.566 ? json-parse-financial 38.368+-0.657 38.156+-0.356 json-stringify-tinderbox 24.770+-0.663 ? 25.124+-1.036 ? might be 1.0143x slower stanford-crypto-aes 39.790+-0.243 ^ 39.388+-0.095 ^ definitely 1.0102x faster stanford-crypto-ccm 35.249+-1.214 ? 35.414+-0.545 ? stanford-crypto-pbkdf2 100.020+-0.200 ? 100.479+-0.765 ? stanford-crypto-sha256-iterative 38.930+-0.192 ? 38.937+-0.293 ? <arithmetic> 54.177+-0.158 54.106+-0.183 might be 1.0013x faster Conf#1 Conf#2 AsmBench: bigfib.cpp 441.9200+-4.5823 ? 446.3416+-1.6150 ? might be 1.0100x slower cray.c 358.0092+-1.4886 357.6292+-2.1206 dry.c 448.0542+-23.9222 436.5019+-24.7843 might be 1.0265x faster FloatMM.c 732.3499+-3.3762 ? 735.2382+-4.9886 ? gcc-loops.cpp 3710.8789+-4.8850 ? 3711.0612+-6.4472 ? n-body.c 808.5736+-2.3940 806.8895+-1.5501 Quicksort.c 398.9364+-1.3773 ? 399.2765+-1.5109 ? stepanov_container.cpp 3320.1520+-12.5985 3318.6777+-11.7300 Towers.c 273.7396+-1.7797 273.2300+-1.4172 <geometric> 726.3499+-4.8021 724.9713+-3.7337 might be 1.0019x faster Conf#1 Conf#2 Geomean of preferred means: <scaled-result> 31.1652+-0.0950 31.1013+-0.0626 might be 1.0021x faster 1179889 3 275370 ggaren 2016-04-01 10:58:23 -0700 Comment on attachment 275370 Patch r=me 1179913 4 275370 commit-queue 2016-04-01 12:20:05 -0700 Comment on attachment 275370 Patch Clearing flags on attachment: 275370 Committed r198953: <http://trac.webkit.org/changeset/198953> 1179914 5 commit-queue 2016-04-01 12:20:08 -0700 All reviewed patches have been landed. Closing bug. 275370 2016-03-31 21:51:51 -0700 2016-04-01 12:20:05 -0700 Patch bug-156095-20160331215155.patch text/plain 10302 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4OTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj MDk3MTc5OTUzMmY1OTcwZjBiM2E0ZDRiY2FlOTYxMWE3ZTE3N2RhLi40NWY1NTRmYzAxNWFjODc3 M2ZhOWRjMGQ4NDJmYzc3ZGVjY2E0Yzg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNi0wMy0zMSAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxl LmNvbT4KKworICAgICAgICBbSlNDXVt4ODZdIEFkZCB0aGUgMyBvcGVyYW5kcyBmb3JtIG9mIGZs b2F0aW5nIHBvaW50IHN1YnN0cmFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU2MDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2FtZSBvbGQsIHNhbWUgb2xkLiBBZGQgdGhlIEFWWCBmb3JtIG9m IHN1YnNkIGFuZCBzdWJzcy4KKworICAgICAgICBVbmZvcnR1bmF0ZWx5LCB3ZSBjYW5ub3QgYmVu ZWZpdCBmcm9tIHRoZSAzIHJlZ2lzdGVyIGZvcm0KKyAgICAgICAgaW4gQjMgeWV0IGJlY2F1c2Ug dGhlIEFpciBzY3JpcHQgZG9lcyBub3Qgc3VwcG9ydCBDUFUgZmxhZ3MgeWV0LgorICAgICAgICBU aGF0IGNhbiBiZSBmaXhlZCBsYXRlci4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2Vt Ymxlclg4NkNvbW1vbi5oOgorICAgICAgICAoSlNDOjpNYWNyb0Fzc2VtYmxlclg4NkNvbW1vbjo6 c3ViRG91YmxlKToKKyAgICAgICAgKEpTQzo6TWFjcm9Bc3NlbWJsZXJYODZDb21tb246OnN1YkZs b2F0KToKKyAgICAgICAgKiBhc3NlbWJsZXIvWDg2QXNzZW1ibGVyLmg6CisgICAgICAgIChKU0M6 Olg4NkFzc2VtYmxlcjo6dnN1YnNkX3JyKToKKyAgICAgICAgKEpTQzo6WDg2QXNzZW1ibGVyOjpz dWJzZF9tcik6CisgICAgICAgIChKU0M6Olg4NkFzc2VtYmxlcjo6dnN1YnNkX21yKToKKyAgICAg ICAgKEpTQzo6WDg2QXNzZW1ibGVyOjp2c3Vic3NfcnIpOgorICAgICAgICAoSlNDOjpYODZBc3Nl bWJsZXI6OnN1YnNzX21yKToKKyAgICAgICAgKEpTQzo6WDg2QXNzZW1ibGVyOjp2c3Vic3NfbXIp OgorICAgICAgICAoSlNDOjpYODZBc3NlbWJsZXI6Olg4Nkluc3RydWN0aW9uRm9ybWF0dGVyOjpT aW5nbGVJbnN0cnVjdGlvbkJ1ZmZlcldyaXRlcjo6bWVtb3J5TW9kUk0pOgorICAgICAgICAqIGIz L2Fpci9BaXJPcGNvZGUub3Bjb2RlczoKKwogMjAxNi0wMy0zMSAgQmVuamFtaW4gUG91bGFpbiAg PGJlbmphbWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0pTQ11beDg2XSBBZGQgdGhlIGluZGV4 ZWQgZm9ybXMgb2YgZmxvYXRpbmcgcG9pbnQgYWRkaXRpb24gYW5kIG11bHRpcGxpY2F0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVy WDg2Q29tbW9uLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1i bGVyWDg2Q29tbW9uLmgKaW5kZXggNDBhNzAwYzI5NDBjZTA2NjAwNWJmMTVjZmUzZTIwNjAxYWQ1 NTI4MC4uYTZiMGE1MzY5ZmQ5ZWQyZjBlYzEzZTAzYjFjY2Q5YzU2ZDBmNjE1NSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlclg4NkNvbW1v bi5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJY ODZDb21tb24uaApAQCAtMTI0NSwzNSArMTI0NSw4OSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHN1 YkRvdWJsZShGUFJlZ2lzdGVySUQgc3JjLCBGUFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAg ICAgIEFTU0VSVChpc1NTRTJQcmVzZW50KCkpOwotICAgICAgICBtX2Fzc2VtYmxlci5zdWJzZF9y cihzcmMsIGRlc3QpOworICAgICAgICBzdWJEb3VibGUoZGVzdCwgc3JjLCBkZXN0KTsKICAgICB9 CiAKICAgICB2b2lkIHN1YkRvdWJsZShGUFJlZ2lzdGVySUQgb3AxLCBGUFJlZ2lzdGVySUQgb3Ay LCBGUFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIC8vIEIgOj0gQSAtIEIgaXMgaW52 YWxpZC4KLSAgICAgICAgQVNTRVJUKG9wMSA9PSBkZXN0IHx8IG9wMiAhPSBkZXN0KTsKKyAgICAg ICAgaWYgKHN1cHBvcnRzQVZYKCkpCisgICAgICAgICAgICBtX2Fzc2VtYmxlci52c3Vic2RfcnIo b3AxLCBvcDIsIGRlc3QpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIEFTU0VSVChpc1NT RTJQcmVzZW50KCkpOwogCi0gICAgICAgIG1vdmVEb3VibGUob3AxLCBkZXN0KTsKLSAgICAgICAg c3ViRG91YmxlKG9wMiwgZGVzdCk7CisgICAgICAgICAgICAvLyBCIDo9IEEgLSBCIGlzIGludmFs aWQuCisgICAgICAgICAgICBBU1NFUlQob3AxID09IGRlc3QgfHwgb3AyICE9IGRlc3QpOworICAg ICAgICAgICAgbW92ZURvdWJsZShvcDEsIGRlc3QpOworICAgICAgICAgICAgbV9hc3NlbWJsZXIu c3Vic2RfcnIob3AyLCBkZXN0KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHZvaWQgc3ViRG91 YmxlKEZQUmVnaXN0ZXJJRCBvcDEsIEFkZHJlc3Mgb3AyLCBGUFJlZ2lzdGVySUQgZGVzdCkKKyAg ICB7CisgICAgICAgIGlmIChzdXBwb3J0c0FWWCgpKQorICAgICAgICAgICAgbV9hc3NlbWJsZXIu dnN1YnNkX21yKG9wMSwgb3AyLm9mZnNldCwgb3AyLmJhc2UsIGRlc3QpOworICAgICAgICBlbHNl IHsKKyAgICAgICAgICAgIG1vdmVEb3VibGUob3AxLCBkZXN0KTsKKyAgICAgICAgICAgIG1fYXNz ZW1ibGVyLnN1YnNkX21yKG9wMi5vZmZzZXQsIG9wMi5iYXNlLCBkZXN0KTsKKyAgICAgICAgfQor ICAgIH0KKworICAgIHZvaWQgc3ViRG91YmxlKEZQUmVnaXN0ZXJJRCBvcDEsIEJhc2VJbmRleCBv cDIsIEZQUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAgICAgICAgaWYgKHN1cHBvcnRzQVZYKCkp CisgICAgICAgICAgICBtX2Fzc2VtYmxlci52c3Vic2RfbXIob3AxLCBvcDIub2Zmc2V0LCBvcDIu YmFzZSwgb3AyLmluZGV4LCBvcDIuc2NhbGUsIGRlc3QpOworICAgICAgICBlbHNlIHsKKyAgICAg ICAgICAgIG1vdmVEb3VibGUob3AxLCBkZXN0KTsKKyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnN1 YnNkX21yKG9wMi5vZmZzZXQsIG9wMi5iYXNlLCBvcDIuaW5kZXgsIG9wMi5zY2FsZSwgZGVzdCk7 CisgICAgICAgIH0KICAgICB9CiAKICAgICB2b2lkIHN1YkRvdWJsZShBZGRyZXNzIHNyYywgRlBS ZWdpc3RlcklEIGRlc3QpCiAgICAgewotICAgICAgICBBU1NFUlQoaXNTU0UyUHJlc2VudCgpKTsK LSAgICAgICAgbV9hc3NlbWJsZXIuc3Vic2RfbXIoc3JjLm9mZnNldCwgc3JjLmJhc2UsIGRlc3Qp OworICAgICAgICBzdWJEb3VibGUoZGVzdCwgc3JjLCBkZXN0KTsKICAgICB9CiAKICAgICB2b2lk IHN1YkZsb2F0KEZQUmVnaXN0ZXJJRCBzcmMsIEZQUmVnaXN0ZXJJRCBkZXN0KQogICAgIHsKLSAg ICAgICAgQVNTRVJUKGlzU1NFMlByZXNlbnQoKSk7Ci0gICAgICAgIG1fYXNzZW1ibGVyLnN1YnNz X3JyKHNyYywgZGVzdCk7CisgICAgICAgIHN1YkZsb2F0KGRlc3QsIHNyYywgZGVzdCk7CisgICAg fQorCisgICAgdm9pZCBzdWJGbG9hdChGUFJlZ2lzdGVySUQgb3AxLCBGUFJlZ2lzdGVySUQgb3Ay LCBGUFJlZ2lzdGVySUQgZGVzdCkKKyAgICB7CisgICAgICAgIGlmIChzdXBwb3J0c0FWWCgpKQor ICAgICAgICAgICAgbV9hc3NlbWJsZXIudnN1YnNzX3JyKG9wMSwgb3AyLCBkZXN0KTsKKyAgICAg ICAgZWxzZSB7CisgICAgICAgICAgICBBU1NFUlQoaXNTU0UyUHJlc2VudCgpKTsKKyAgICAgICAg ICAgIC8vIEIgOj0gQSAtIEIgaXMgaW52YWxpZC4KKyAgICAgICAgICAgIEFTU0VSVChvcDEgPT0g ZGVzdCB8fCBvcDIgIT0gZGVzdCk7CisgICAgICAgICAgICBtb3ZlRG91YmxlKG9wMSwgZGVzdCk7 CisgICAgICAgICAgICBtX2Fzc2VtYmxlci5zdWJzc19ycihvcDIsIGRlc3QpOworICAgICAgICB9 CisgICAgfQorCisgICAgdm9pZCBzdWJGbG9hdChGUFJlZ2lzdGVySUQgb3AxLCBBZGRyZXNzIG9w MiwgRlBSZWdpc3RlcklEIGRlc3QpCisgICAgeworICAgICAgICBpZiAoc3VwcG9ydHNBVlgoKSkK KyAgICAgICAgICAgIG1fYXNzZW1ibGVyLnZzdWJzc19tcihvcDEsIG9wMi5vZmZzZXQsIG9wMi5i YXNlLCBkZXN0KTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBtb3ZlRG91YmxlKG9wMSwg ZGVzdCk7CisgICAgICAgICAgICBtX2Fzc2VtYmxlci5zdWJzc19tcihvcDIub2Zmc2V0LCBvcDIu YmFzZSwgZGVzdCk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICB2b2lkIHN1YkZsb2F0KEZQUmVn aXN0ZXJJRCBvcDEsIEJhc2VJbmRleCBvcDIsIEZQUmVnaXN0ZXJJRCBkZXN0KQorICAgIHsKKyAg ICAgICAgaWYgKHN1cHBvcnRzQVZYKCkpCisgICAgICAgICAgICBtX2Fzc2VtYmxlci52c3Vic3Nf bXIob3AxLCBvcDIub2Zmc2V0LCBvcDIuYmFzZSwgb3AyLmluZGV4LCBvcDIuc2NhbGUsIGRlc3Qp OworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIG1vdmVEb3VibGUob3AxLCBkZXN0KTsKKyAg ICAgICAgICAgIG1fYXNzZW1ibGVyLnN1YnNzX21yKG9wMi5vZmZzZXQsIG9wMi5iYXNlLCBvcDIu aW5kZXgsIG9wMi5zY2FsZSwgZGVzdCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICB2b2lkIHN1 YkZsb2F0KEFkZHJlc3Mgc3JjLCBGUFJlZ2lzdGVySUQgZGVzdCkKICAgICB7Ci0gICAgICAgIEFT U0VSVChpc1NTRTJQcmVzZW50KCkpOwotICAgICAgICBtX2Fzc2VtYmxlci5zdWJzc19tcihzcmMu b2Zmc2V0LCBzcmMuYmFzZSwgZGVzdCk7CisgICAgICAgIHN1YkZsb2F0KGRlc3QsIHNyYywgZGVz dCk7CiAgICAgfQogCiAgICAgdm9pZCBtdWxEb3VibGUoRlBSZWdpc3RlcklEIHNyYywgRlBSZWdp c3RlcklEIGRlc3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVy L1g4NkFzc2VtYmxlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9YODZBc3Nl bWJsZXIuaAppbmRleCAzNGFjYzEyMDZiMDk0OThiM2Y1YmYxYWYyZDQwMjlmZjFjOTE1ODVlLi5i YmYxY2U2OGJhNzVjZjUyOGNhYjkyMmVjYmFmY2FhNWE1MDk0Mzg5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL1g4NkFzc2VtYmxlci5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvWDg2QXNzZW1ibGVyLmgKQEAgLTI0NDEsMjQgKzI0NDEs NjYgQEAgcHVibGljOgogICAgICAgICBtX2Zvcm1hdHRlci50d29CeXRlT3AoT1AyX1NVQlNEX1Zz ZFdzZCwgKFJlZ2lzdGVySUQpZHN0LCAoUmVnaXN0ZXJJRClzcmMpOwogICAgIH0KIAorICAgIHZv aWQgdnN1YnNkX3JyKFhNTVJlZ2lzdGVySUQgYSwgWE1NUmVnaXN0ZXJJRCBiLCBYTU1SZWdpc3Rl cklEIGRzdCkKKyAgICB7CisgICAgICAgIG1fZm9ybWF0dGVyLnZleE5kc0xpZ1dpZ1R3b0J5dGVP cChQUkVfU1NFX0YyLCBPUDJfU1VCU0RfVnNkV3NkLCAoUmVnaXN0ZXJJRClkc3QsIChSZWdpc3Rl cklEKWEsIChSZWdpc3RlcklEKWIpOworICAgIH0KKwogICAgIHZvaWQgc3Vic2RfbXIoaW50IG9m ZnNldCwgUmVnaXN0ZXJJRCBiYXNlLCBYTU1SZWdpc3RlcklEIGRzdCkKICAgICB7CiAgICAgICAg IG1fZm9ybWF0dGVyLnByZWZpeChQUkVfU1NFX0YyKTsKICAgICAgICAgbV9mb3JtYXR0ZXIudHdv Qnl0ZU9wKE9QMl9TVUJTRF9Wc2RXc2QsIChSZWdpc3RlcklEKWRzdCwgYmFzZSwgb2Zmc2V0KTsK ICAgICB9CiAKKyAgICB2b2lkIHN1YnNkX21yKGludCBvZmZzZXQsIFJlZ2lzdGVySUQgYmFzZSwg UmVnaXN0ZXJJRCBpbmRleCwgaW50IHNjYWxlLCBYTU1SZWdpc3RlcklEIGRzdCkKKyAgICB7Cisg ICAgICAgIG1fZm9ybWF0dGVyLnByZWZpeChQUkVfU1NFX0YyKTsKKyAgICAgICAgbV9mb3JtYXR0 ZXIudHdvQnl0ZU9wKE9QMl9TVUJTRF9Wc2RXc2QsIGRzdCwgYmFzZSwgaW5kZXgsIHNjYWxlLCBv ZmZzZXQpOworICAgIH0KKworICAgIHZvaWQgdnN1YnNkX21yKFhNTVJlZ2lzdGVySUQgYiwgaW50 IG9mZnNldCwgUmVnaXN0ZXJJRCBiYXNlLCBYTU1SZWdpc3RlcklEIGRzdCkKKyAgICB7CisgICAg ICAgIG1fZm9ybWF0dGVyLnZleE5kc0xpZ1dpZ1R3b0J5dGVPcChQUkVfU1NFX0YyLCBPUDJfU1VC U0RfVnNkV3NkLCAoUmVnaXN0ZXJJRClkc3QsIChSZWdpc3RlcklEKWIsIGJhc2UsIG9mZnNldCk7 CisgICAgfQorCisgICAgdm9pZCB2c3Vic2RfbXIoWE1NUmVnaXN0ZXJJRCBiLCBpbnQgb2Zmc2V0 LCBSZWdpc3RlcklEIGJhc2UsIFJlZ2lzdGVySUQgaW5kZXgsIGludCBzY2FsZSwgWE1NUmVnaXN0 ZXJJRCBkc3QpCisgICAgeworICAgICAgICBtX2Zvcm1hdHRlci52ZXhOZHNMaWdXaWdUd29CeXRl T3AoUFJFX1NTRV9GMiwgT1AyX1NVQlNEX1ZzZFdzZCwgKFJlZ2lzdGVySUQpZHN0LCAoUmVnaXN0 ZXJJRCliLCBvZmZzZXQsIGJhc2UsIGluZGV4LCBzY2FsZSk7CisgICAgfQorCiAgICAgdm9pZCBz dWJzc19ycihYTU1SZWdpc3RlcklEIHNyYywgWE1NUmVnaXN0ZXJJRCBkc3QpCiAgICAgewogICAg ICAgICBtX2Zvcm1hdHRlci5wcmVmaXgoUFJFX1NTRV9GMyk7CiAgICAgICAgIG1fZm9ybWF0dGVy LnR3b0J5dGVPcChPUDJfU1VCU0RfVnNkV3NkLCAoUmVnaXN0ZXJJRClkc3QsIChSZWdpc3RlcklE KXNyYyk7CiAgICAgfQogCisgICAgdm9pZCB2c3Vic3NfcnIoWE1NUmVnaXN0ZXJJRCBhLCBYTU1S ZWdpc3RlcklEIGIsIFhNTVJlZ2lzdGVySUQgZHN0KQorICAgIHsKKyAgICAgICAgbV9mb3JtYXR0 ZXIudmV4TmRzTGlnV2lnVHdvQnl0ZU9wKFBSRV9TU0VfRjMsIE9QMl9TVUJTRF9Wc2RXc2QsIChS ZWdpc3RlcklEKWRzdCwgKFJlZ2lzdGVySUQpYSwgKFJlZ2lzdGVySUQpYik7CisgICAgfQorCiAg ICAgdm9pZCBzdWJzc19tcihpbnQgb2Zmc2V0LCBSZWdpc3RlcklEIGJhc2UsIFhNTVJlZ2lzdGVy SUQgZHN0KQogICAgIHsKICAgICAgICAgbV9mb3JtYXR0ZXIucHJlZml4KFBSRV9TU0VfRjMpOwog ICAgICAgICBtX2Zvcm1hdHRlci50d29CeXRlT3AoT1AyX1NVQlNEX1ZzZFdzZCwgKFJlZ2lzdGVy SUQpZHN0LCBiYXNlLCBvZmZzZXQpOwogICAgIH0KIAorICAgIHZvaWQgc3Vic3NfbXIoaW50IG9m ZnNldCwgUmVnaXN0ZXJJRCBiYXNlLCBSZWdpc3RlcklEIGluZGV4LCBpbnQgc2NhbGUsIFhNTVJl Z2lzdGVySUQgZHN0KQorICAgIHsKKyAgICAgICAgbV9mb3JtYXR0ZXIucHJlZml4KFBSRV9TU0Vf RjMpOworICAgICAgICBtX2Zvcm1hdHRlci50d29CeXRlT3AoT1AyX1NVQlNEX1ZzZFdzZCwgZHN0 LCBiYXNlLCBpbmRleCwgc2NhbGUsIG9mZnNldCk7CisgICAgfQorCisgICAgdm9pZCB2c3Vic3Nf bXIoWE1NUmVnaXN0ZXJJRCBiLCBpbnQgb2Zmc2V0LCBSZWdpc3RlcklEIGJhc2UsIFhNTVJlZ2lz dGVySUQgZHN0KQorICAgIHsKKyAgICAgICAgbV9mb3JtYXR0ZXIudmV4TmRzTGlnV2lnVHdvQnl0 ZU9wKFBSRV9TU0VfRjMsIE9QMl9TVUJTRF9Wc2RXc2QsIChSZWdpc3RlcklEKWRzdCwgKFJlZ2lz dGVySUQpYiwgYmFzZSwgb2Zmc2V0KTsKKyAgICB9CisKKyAgICB2b2lkIHZzdWJzc19tcihYTU1S ZWdpc3RlcklEIGIsIGludCBvZmZzZXQsIFJlZ2lzdGVySUQgYmFzZSwgUmVnaXN0ZXJJRCBpbmRl eCwgaW50IHNjYWxlLCBYTU1SZWdpc3RlcklEIGRzdCkKKyAgICB7CisgICAgICAgIG1fZm9ybWF0 dGVyLnZleE5kc0xpZ1dpZ1R3b0J5dGVPcChQUkVfU1NFX0YzLCBPUDJfU1VCU0RfVnNkV3NkLCAo UmVnaXN0ZXJJRClkc3QsIChSZWdpc3RlcklEKWIsIG9mZnNldCwgYmFzZSwgaW5kZXgsIHNjYWxl KTsKKyAgICB9CisKICAgICB2b2lkIHVjb21pc2RfcnIoWE1NUmVnaXN0ZXJJRCBzcmMsIFhNTVJl Z2lzdGVySUQgZHN0KQogICAgIHsKICAgICAgICAgbV9mb3JtYXR0ZXIucHJlZml4KFBSRV9TU0Vf NjYpOwpAQCAtMzMzOSwxNCArMzM4MSw5IEBAIHByaXZhdGU6CiAgICAgICAgICAgICB3cml0ZXIu bWVtb3J5TW9kUk0ocmVnLCBhZGRyZXNzKTsKICAgICAgICAgfQogI2VuZGlmCi0gICAgICAgIHZv aWQgdmV4TmRzTGlnV2lnQ29tbXV0YXRpdmVUd29CeXRlT3AoT25lQnl0ZU9wY29kZUlEIHNpbWRQ cmVmaXgsIFR3b0J5dGVPcGNvZGVJRCBvcGNvZGUsIFJlZ2lzdGVySUQgZGVzdCwgUmVnaXN0ZXJJ RCBhLCBSZWdpc3RlcklEIGIpCisgICAgICAgIHZvaWQgdmV4TmRzTGlnV2lnVHdvQnl0ZU9wKE9u ZUJ5dGVPcGNvZGVJRCBzaW1kUHJlZml4LCBUd29CeXRlT3Bjb2RlSUQgb3Bjb2RlLCBSZWdpc3Rl cklEIGRlc3QsIFJlZ2lzdGVySUQgYSwgUmVnaXN0ZXJJRCBiKQogICAgICAgICB7CiAgICAgICAg ICAgICBTaW5nbGVJbnN0cnVjdGlvbkJ1ZmZlcldyaXRlciB3cml0ZXIobV9idWZmZXIpOwotCi0g ICAgICAgICAgICAvLyBTaW5jZSB0aGlzIGlzIGEgY29tbXV0YXRpdmUgb3BlcmF0aW9uLCB3ZSBj YW4gdHJ5IHN3aXRjaGluZyB0aGUgYXJndW1lbnRzLgotICAgICAgICAgICAgaWYgKHJlZ1JlcXVp cmVzUmV4KGIpKQotICAgICAgICAgICAgICAgIHN0ZDo6c3dhcChhLCBiKTsKLQogICAgICAgICAg ICAgaWYgKHJlZ1JlcXVpcmVzUmV4KGIpKQogICAgICAgICAgICAgICAgIHdyaXRlci50aHJlZUJ5 dGVzVmV4TmRzKHNpbWRQcmVmaXgsIFZleEltcGxpZWRCeXRlczo6VHdvQnl0ZXNPcCwgZGVzdCwg YSwgYik7CiAgICAgICAgICAgICBlbHNlCkBAIC0zMzU1LDYgKzMzOTIsMTQgQEAgcHJpdmF0ZToK ICAgICAgICAgICAgIHdyaXRlci5yZWdpc3Rlck1vZFJNKGRlc3QsIGIpOwogICAgICAgICB9CiAK KyAgICAgICAgdm9pZCB2ZXhOZHNMaWdXaWdDb21tdXRhdGl2ZVR3b0J5dGVPcChPbmVCeXRlT3Bj b2RlSUQgc2ltZFByZWZpeCwgVHdvQnl0ZU9wY29kZUlEIG9wY29kZSwgUmVnaXN0ZXJJRCBkZXN0 LCBSZWdpc3RlcklEIGEsIFJlZ2lzdGVySUQgYikKKyAgICAgICAgeworICAgICAgICAgICAgLy8g U2luY2UgdGhpcyBpcyBhIGNvbW11dGF0aXZlIG9wZXJhdGlvbiwgd2UgY2FuIHRyeSBzd2l0Y2hp bmcgdGhlIGFyZ3VtZW50cy4KKyAgICAgICAgICAgIGlmIChyZWdSZXF1aXJlc1JleChiKSkKKyAg ICAgICAgICAgICAgICBzdGQ6OnN3YXAoYSwgYik7CisgICAgICAgICAgICB2ZXhOZHNMaWdXaWdU d29CeXRlT3Aoc2ltZFByZWZpeCwgb3Bjb2RlLCBkZXN0LCBhLCBiKTsKKyAgICAgICAgfQorCiAg ICAgICAgIHZvaWQgdmV4TmRzTGlnV2lnVHdvQnl0ZU9wKE9uZUJ5dGVPcGNvZGVJRCBzaW1kUHJl Zml4LCBUd29CeXRlT3Bjb2RlSUQgb3Bjb2RlLCBSZWdpc3RlcklEIGRlc3QsIFJlZ2lzdGVySUQg YSwgUmVnaXN0ZXJJRCBiYXNlLCBpbnQgb2Zmc2V0KQogICAgICAgICB7CiAgICAgICAgICAgICBT aW5nbGVJbnN0cnVjdGlvbkJ1ZmZlcldyaXRlciB3cml0ZXIobV9idWZmZXIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fpci9BaXJPcGNvZGUub3Bjb2RlcyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9iMy9haXIvQWlyT3Bjb2RlLm9wY29kZXMKaW5kZXggM2Q5MjVjYzcz YWE4ZTQ0ZDY5ZmJlZWRhNWI4YzkzY2VjYWFjNThhOC4uY2RjYzQ3ZWQ3MzdhOWM0MzJhMWE3Mzlj YmU5ODU2MDQ3ZjkzMTQxNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2IzL2Fp ci9BaXJPcGNvZGUub3Bjb2RlcworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYjMvYWlyL0Fp ck9wY29kZS5vcGNvZGVzCkBAIC0xNzcsMTUgKzE3NywxOSBAQCBTdWIzMiBVOkc6MzIsIFVaRDpH OjMyCiAgICAgeDg2OiBBZGRyLCBUbXAKICAgICB4ODY6IFRtcCwgQWRkcgogCi1hcm02NDogU3Vi RG91YmxlIFU6Rjo2NCwgVTpGOjY0LCBEOkY6NjQKLSAgICBUbXAsIFRtcCwgVG1wCitTdWJEb3Vi bGUgVTpGOjY0LCBVOkY6NjQsIEQ6Rjo2NAorICAgIGFybTY0OiBUbXAsIFRtcCwgVG1wCisgICAg eDg2OiBUbXAsIEFkZHIsIFRtcAorICAgIHg4NjogVG1wLCBJbmRleCwgVG1wCiAKIHg4NjogU3Vi RG91YmxlIFU6Rjo2NCwgVUQ6Rjo2NAogICAgIFRtcCwgVG1wCiAgICAgQWRkciwgVG1wCiAKLWFy bTY0OiBTdWJGbG9hdCBVOkY6MzIsIFU6RjozMiwgRDpGOjMyCi0gICAgVG1wLCBUbXAsIFRtcAor U3ViRmxvYXQgVTpGOjMyLCBVOkY6MzIsIEQ6RjozMgorICAgIGFybTY0OiBUbXAsIFRtcCwgVG1w CisgICAgeDg2OiBUbXAsIEFkZHIsIFRtcAorICAgIHg4NjogVG1wLCBJbmRleCwgVG1wCiAKIHg4 NjogU3ViRmxvYXQgVTpGOjMyLCBVRDpGOjMyCiAgICAgVG1wLCBUbXAK