200282 2019-07-30 14:10:11 -0700 [WHLSL] Checker sets wrong type for property access instruction with an ander 2019-07-30 16:43:16 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam commit-queue dino fpizlo jonlee justin_fan mmaxfield rmorisset webkit-bug-importer oldest_to_newest 1557069 0 saam 2019-07-30 14:10:11 -0700 ... 1557081 1 375180 saam 2019-07-30 14:41:57 -0700 Created attachment 375180 WIP need to write a test and changelog and then it's ready 1557085 2 375183 saam 2019-07-30 14:57:04 -0700 Created attachment 375183 patch 1557087 3 375183 rmorisset 2019-07-30 14:59:36 -0700 Comment on attachment 375183 patch The fix LGTM. Is there a reason for this large test, instead of using the test harness like most recent WHLSL tests? 1557088 4 saam 2019-07-30 15:09:50 -0700 (In reply to Robin Morisset from comment #3) > Comment on attachment 375183 [details] > patch > > The fix LGTM. > > Is there a reason for this large test, instead of using the test harness > like most recent WHLSL tests? Yes, the harness does the boxing/unboxing for us. We haven't taught it how to take in structs AFAIK 1557089 5 375183 mmaxfield 2019-07-30 15:13:21 -0700 Comment on attachment 375183 patch View in context: https://bugs.webkit.org/attachment.cgi?id=375183&action=review > LayoutTests/webgpu/whlsl/device-proper-type-checker.html:23 > +compute void computeShader(device Point[] buffer : register(u0), float3 threadID : SV_DispatchThreadID) { > + float x = buffer[0].x; > + float y = buffer[0].y; > + x += 1.0; > + y += 1.0; > + buffer[0].x = x; > + buffer[0].y = y; > +} Can't we use the fancy harness for this? 1557091 6 saam 2019-07-30 15:15:57 -0700 (In reply to Myles C. Maxfield from comment #5) > Comment on attachment 375183 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=375183&action=review > > > LayoutTests/webgpu/whlsl/device-proper-type-checker.html:23 > > +compute void computeShader(device Point[] buffer : register(u0), float3 threadID : SV_DispatchThreadID) { > > + float x = buffer[0].x; > > + float y = buffer[0].y; > > + x += 1.0; > > + y += 1.0; > > + buffer[0].x = x; > > + buffer[0].y = y; > > +} > > Can't we use the fancy harness for this? See above. 1557132 7 375183 commit-queue 2019-07-30 16:42:37 -0700 Comment on attachment 375183 patch Clearing flags on attachment: 375183 Committed r248022: <https://trac.webkit.org/changeset/248022> 1557133 8 commit-queue 2019-07-30 16:42:38 -0700 All reviewed patches have been landed. Closing bug. 1557134 9 webkit-bug-importer 2019-07-30 16:43:16 -0700 <rdar://problem/53734700> 375180 2019-07-30 14:41:57 -0700 2019-07-30 14:57:04 -0700 WIP b-backup.diff text/plain 5212 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMQVNURHVtcGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9X SExTTEFTVER1bXBlci5jcHAJKHJldmlzaW9uIDI0NzkzOCkKKysrIFNvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMQVNURHVtcGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDI2LDE5ICs0MjYsMzIgQEAgdm9pZCBBU1REdW1wZXI6OnZpc2l0KEFTVDo6Rm9yTG9vcCYgZm9y TAogCiB2b2lkIEFTVER1bXBlcjo6dmlzaXQoQVNUOjpFeHByZXNzaW9uJiBleHByZXNzaW9uKQog ewotICAgIGJvb2wgc2tpcFBhcmVucyA9IGlzPEFTVDo6Qm9vbGVhbkxpdGVyYWw+KGV4cHJlc3Np b24pCi0gICAgICAgIHx8IGlzPEFTVDo6RmxvYXRMaXRlcmFsPihleHByZXNzaW9uKQotICAgICAg ICB8fCBpczxBU1Q6OkludGVnZXJMaXRlcmFsPihleHByZXNzaW9uKQotICAgICAgICB8fCBpczxB U1Q6Ok51bGxMaXRlcmFsPihleHByZXNzaW9uKQotICAgICAgICB8fCBpczxBU1Q6OlVuc2lnbmVk SW50ZWdlckxpdGVyYWw+KGV4cHJlc3Npb24pCi0gICAgICAgIHx8IGlzPEFTVDo6RW51bWVyYXRp b25NZW1iZXJMaXRlcmFsPihleHByZXNzaW9uKQotICAgICAgICB8fCBpczxBU1Q6OkNvbW1hRXhw cmVzc2lvbj4oZXhwcmVzc2lvbikKLSAgICAgICAgfHwgaXM8QVNUOjpWYXJpYWJsZVJlZmVyZW5j ZT4oZXhwcmVzc2lvbik7CisgICAgLy9ib29sIHNraXBQYXJlbnMgPSBpczxBU1Q6OkJvb2xlYW5M aXRlcmFsPihleHByZXNzaW9uKQorICAgIC8vICAgIHx8IGlzPEFTVDo6RmxvYXRMaXRlcmFsPihl eHByZXNzaW9uKQorICAgIC8vICAgIHx8IGlzPEFTVDo6SW50ZWdlckxpdGVyYWw+KGV4cHJlc3Np b24pCisgICAgLy8gICAgfHwgaXM8QVNUOjpOdWxsTGl0ZXJhbD4oZXhwcmVzc2lvbikKKyAgICAv LyAgICB8fCBpczxBU1Q6OlVuc2lnbmVkSW50ZWdlckxpdGVyYWw+KGV4cHJlc3Npb24pCisgICAg Ly8gICAgfHwgaXM8QVNUOjpFbnVtZXJhdGlvbk1lbWJlckxpdGVyYWw+KGV4cHJlc3Npb24pCisg ICAgLy8gICAgfHwgaXM8QVNUOjpDb21tYUV4cHJlc3Npb24+KGV4cHJlc3Npb24pCisgICAgLy8g ICAgfHwgaXM8QVNUOjpWYXJpYWJsZVJlZmVyZW5jZT4oZXhwcmVzc2lvbik7CisKKyAgICBpZiAo YXV0byogYW5ub3RhdGlvbiA9IGV4cHJlc3Npb24ubWF5YmVUeXBlQW5ub3RhdGlvbigpKSB7Cisg ICAgICAgIGlmIChhdXRvIGFkZHJlc3NTcGFjZSA9IGFubm90YXRpb24tPmxlZnRBZGRyZXNzU3Bh Y2UoKSkgeworICAgICAgICAgICAgbV9vdXQucHJpbnQoIjwiLCBBU1Q6OnRvU3RyaW5nKCphZGRy ZXNzU3BhY2UpKTsKKyAgICAgICAgfSBlbHNlIGlmIChhbm5vdGF0aW9uLT5pc0Fic3RyYWN0TGVm dFZhbHVlKCkpCisgICAgICAgICAgICBtX291dC5wcmludCgiPEFic3RyYWN0TGVmdFZhbHVlIik7 CisgICAgICAgIGVsc2UgaWYgKGFubm90YXRpb24tPmlzUmlnaHRWYWx1ZSgpKQorICAgICAgICAg ICAgbV9vdXQucHJpbnQoIjxSaWdodFZhbHVlIik7CisKKyAgICAgICAgaWYgKGlzPEFTVDo6UmVm ZXJlbmNlVHlwZT4oZXhwcmVzc2lvbi5yZXNvbHZlZFR5cGUoKSkpCisgICAgICAgICAgICBtX291 dC5wcmludCgiLCAiLCBBU1Q6OnRvU3RyaW5nKGRvd25jYXN0PEFTVDo6UmVmZXJlbmNlVHlwZT4o ZXhwcmVzc2lvbi5yZXNvbHZlZFR5cGUoKSkuYWRkcmVzc1NwYWNlKCkpLCAiKiIpOworICAgICAg ICBtX291dC5wcmludCgiPiIpOworICAgIH0KIAotICAgIGlmICghc2tpcFBhcmVucykKKyAgICAv L2lmICghc2tpcFBhcmVucykKICAgICAgICAgbV9vdXQucHJpbnQoIigiKTsKICAgICBCYXNlOjp2 aXNpdChleHByZXNzaW9uKTsKLSAgICBpZiAoIXNraXBQYXJlbnMpCisgICAgLy9pZiAoIXNraXBQ YXJlbnMpCiAgICAgICAgIG1fb3V0LnByaW50KCIpIik7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMQ2hlY2tlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hMU0xDaGVja2VyLmNwcAkocmV2 aXNpb24gMjQ3OTM4KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJncHUvV0hMU0wvV0hM U0xDaGVja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1OCw3ICsxMDU4LDcgQEAgdm9pZCBD aGVja2VyOjpmaW5pc2hWaXNpdGluZyhBU1Q6OlByb3BlcgogICAgIEFTVDo6VHlwZUFubm90YXRp b24gdHlwZUFubm90YXRpb24gPSBBU1Q6OlJpZ2h0VmFsdWUoKTsKICAgICBpZiAoYXV0byBsZWZ0 QWRkcmVzc1NwYWNlID0gYmFzZUluZm8tPnR5cGVBbm5vdGF0aW9uLmxlZnRBZGRyZXNzU3BhY2Uo KSkgewogICAgICAgICBpZiAoYW5kZXJGdW5jdGlvbikKLSAgICAgICAgICAgIHR5cGVBbm5vdGF0 aW9uID0gQVNUOjpMZWZ0VmFsdWUgeyAqbGVmdEFkZHJlc3NTcGFjZSB9OworICAgICAgICAgICAg dHlwZUFubm90YXRpb24gPSBBU1Q6OkxlZnRWYWx1ZSB7IGRvd25jYXN0PEFTVDo6UmVmZXJlbmNl VHlwZT4oYW5kZXJGdW5jdGlvbi0+dHlwZSgpKS5hZGRyZXNzU3BhY2UoKSB9OwogICAgICAgICBl bHNlIGlmIChzZXR0ZXJGdW5jdGlvbikKICAgICAgICAgICAgIHR5cGVBbm5vdGF0aW9uID0gQVNU OjpBYnN0cmFjdExlZnRWYWx1ZSgpOwogICAgIH0gZWxzZSBpZiAoIWJhc2VJbmZvLT50eXBlQW5u b3RhdGlvbi5pc1JpZ2h0VmFsdWUoKSAmJiAoc2V0dGVyRnVuY3Rpb24gfHwgdGhyZWFkQW5kZXJG dW5jdGlvbikpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9XSExT TFByZXBhcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1 L1dITFNML1dITFNMUHJlcGFyZS5jcHAJKHJldmlzaW9uIDI0NzkzOCkKKysrIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMUHJlcGFyZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTYyLDcgKzYyLDcgQEAgbmFtZXNwYWNlIFdITFNMIHsKIHN0YXRpYyBjb25zdGV4cHIgYm9v bCBkdW1wQVNUQmVmb3JlRWFjaFBhc3MgPSBmYWxzZTsKIHN0YXRpYyBjb25zdGV4cHIgYm9vbCBk dW1wQVNUQWZ0ZXJQYXJzaW5nID0gZmFsc2U7CiBzdGF0aWMgY29uc3RleHByIGJvb2wgZHVtcEFT VEF0RW5kID0gZmFsc2U7Ci1zdGF0aWMgY29uc3RleHByIGJvb2wgYWx3YXlzRHVtcFBhc3NGYWls dXJlcyA9IGZhbHNlOworc3RhdGljIGNvbnN0ZXhwciBib29sIGFsd2F5c0R1bXBQYXNzRmFpbHVy ZXMgPSB0cnVlOwogc3RhdGljIGNvbnN0ZXhwciBib29sIGR1bXBQYXNzRmFpbHVyZSA9IGR1bXBB U1RCZWZvcmVFYWNoUGFzcyB8fCBkdW1wQVNUQWZ0ZXJQYXJzaW5nIHx8IGR1bXBBU1RBdEVuZCB8 fCBhbHdheXNEdW1wUGFzc0ZhaWx1cmVzOwogc3RhdGljIGNvbnN0ZXhwciBib29sIGR1bXBQaGFz ZVRpbWVzID0gZmFsc2U7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dI TFNML0FTVC9XSExTTEFkZHJlc3NTcGFjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZ3B1L1dITFNML0FTVC9XSExTTEFkZHJlc3NTcGFjZS5oCShyZXZpc2lvbiAy NDc5MzgpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9BU1QvV0hMU0xB ZGRyZXNzU3BhY2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTIxLDYgKzEyMSwxMiBAQCBwdWJsaWM6 CiAgICAgICAgIHJldHVybiBXVEY6OnZpc2l0KHZpc2l0b3IsIG1faW5uZXIpOwogICAgIH0KIAor ICAgIGJvb2wgaXNBYnN0cmFjdExlZnRWYWx1ZSgpIGNvbnN0CisgICAgeworICAgICAgICBBU1NF UlQoIW1fZW1wdHkpOworICAgICAgICByZXR1cm4gV1RGOjpob2xkc19hbHRlcm5hdGl2ZTxBYnN0 cmFjdExlZnRWYWx1ZT4obV9pbm5lcik7CisgICAgfQorCiBwcml2YXRlOgogICAgIFZhcmlhbnQ8 TGVmdFZhbHVlLCBBYnN0cmFjdExlZnRWYWx1ZSwgUmlnaHRWYWx1ZT4gbV9pbm5lcjsKICNpZiAh QVNTRVJUX0RJU0FCTEVECkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n cHUvY29jb2EvR1BVQ29tcHV0ZVBpcGVsaW5lTWV0YWwubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVUNvbXB1dGVQaXBlbGluZU1l dGFsLm1tCShyZXZpc2lvbiAyNDc5MzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ncHUvY29jb2EvR1BVQ29tcHV0ZVBpcGVsaW5lTWV0YWwubW0JKHdvcmtpbmcgY29weSkK QEAgLTg3LDEwICs4NywxMCBAQCBzdGF0aWMgT3B0aW9uYWw8V0hMU0w6OkNvbXB1dGVEaW1lbnNp b25zCiAgICAgICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKICAgICAgICAgY29tcHV0 ZUxpYnJhcnkgPSBhZG9wdE5TKFtkZXZpY2UucGxhdGZvcm1EZXZpY2UoKSBuZXdMaWJyYXJ5V2l0 aFNvdXJjZTp3aGxzbENvbXBpbGVSZXN1bHQtPm1ldGFsU291cmNlIG9wdGlvbnM6bmlsIGVycm9y OiZlcnJvcl0pOwogICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotI2lmbmRlZiBO REVCVUcKKy8vI2lmbmRlZiBOREVCVUcKICAgICAgICAgaWYgKCFjb21wdXRlTGlicmFyeSkKICAg ICAgICAgICAgIE5TTG9nKEAiJUAiLCBlcnJvcik7Ci0jZW5kaWYKKy8vI2VuZGlmCiAgICAgICAg IEFTU0VSVChjb21wdXRlTGlicmFyeSk7CiAgICAgICAgIC8vIEZJWE1FOiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NzcxIE9uY2Ugd2UgemVyby1maWxsIHZhcmlh YmxlcywgdGhlcmUgc2hvdWxkIGJlIG5vIHdhcm5pbmdzLCBzbyB3ZSBzaG91bGQgYmUgYWJsZSB0 byBBU1NFUlQoIWVycm9yKSBoZXJlLgogCg== 375183 2019-07-30 14:57:04 -0700 2019-07-30 16:42:37 -0700 patch b-backup.diff text/plain 7043 saam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODAxOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA3LTMwICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFtXSExTTF0gQ2hlY2tlciBzZXRz IHdyb25nIHR5cGUgZm9yIHByb3BlcnR5IGFjY2VzcyBpbnN0cnVjdGlvbiB3aXRoIGFuIGFuZGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAyODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSB3ZXJl IGFzc2lnbmluZyByZXN1bHRpbmcgdHlwZSBiYXNlZCBvbiB0aGUgYmFzZSB2YWx1ZSBpbnN0ZWFk IG9mIHRoZSBhbmRlcgorICAgICAgICBvZiB0aGUgYmFzZSB2YWx1ZS4gRm9yIGV4YW1wbGUsIGNv bnNpZGVyOgorICAgICAgICBgYGAKKyAgICAgICAgc3RydWN0IFBvaW50IHsgZmxvYXQgeDsgZmxv YXQgeTsgfQorICAgICAgICBjb21wdXRlIG1haW4oZGV2aWNlIFBvaW50W10gYnVmZmVyKSB7IGJ1 ZmZlclswXTsgfQorICAgICAgICBgYGAKKyAgICAgICAgCisgICAgICAgIFRoZSBsb2NhbCB2YXJp YWJsZSAiYnVmZmVyIiBpcyBpbiB0aGUgInRocmVhZCIgYWRkcmVzcyBzcGFjZS4gU28gd2Ugd291 bGQgZW5kIHVwCisgICAgICAgIHRyeWluZyB0byB1c2UgdGhlIHRocmVhZCBhZGRyZXNzIHNwYWNl IGZvciAiYnVmZmVyWzBdIi4gVGhpcyBjYXVzZWQgdXMgdG8KKyAgICAgICAgZ2VuZXJhdGUgaW52 YWxpZCBNZXRhbCBjb2RlIGJlY2F1c2Ugd2Ugd291bGQgY2FsbCBhICJ0aHJlYWQiIGFuZGVyIHdp dGggYQorICAgICAgICAiZGV2aWNlIiBwb2ludGVyLiBUaGUgZml4IGlzIHRvIHVzZSB0aGUgImRl dmljZSIgYWRkcmVzcyBzcGFjZSwgd2hpY2ggaXMKKyAgICAgICAgdGhlIHR5cGUgb2YgdGhlIGFu ZGVyIHdlIHdlcmUgYWxyZWFkeSBzZXR0aW5nIG9uIHRoaXMgcHJvcGVydHkgYWNjZXNzIGluc3Ry dWN0aW9uLgorCisgICAgICAgIFRlc3Q6IHdlYmdwdS93aGxzbC9kZXZpY2UtcHJvcGVyLXR5cGUt Y2hlY2tlci5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYmdwdS9XSExTTC9XSExTTENoZWNr ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V0hMU0w6OkNoZWNrZXI6OmZpbmlzaFZpc2l0aW5n KToKKwogMjAxOS0wNy0zMCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI0MTI4OCk6IFRleHQgb24gWWFob28gSmFwYW4gbW9i aWxlIGxvb2tzIHRvbyBib2xkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmdwdS9X SExTTC9XSExTTENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViZ3B1L1dITFNML1dITFNMQ2hlY2tlci5jcHAJKHJldmlzaW9uIDI0NzkzOCkKKysrIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML1dITFNMQ2hlY2tlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEwNTgsNyArMTA1OCw3IEBAIHZvaWQgQ2hlY2tlcjo6ZmluaXNoVmlzaXRp bmcoQVNUOjpQcm9wZXIKICAgICBBU1Q6OlR5cGVBbm5vdGF0aW9uIHR5cGVBbm5vdGF0aW9uID0g QVNUOjpSaWdodFZhbHVlKCk7CiAgICAgaWYgKGF1dG8gbGVmdEFkZHJlc3NTcGFjZSA9IGJhc2VJ bmZvLT50eXBlQW5ub3RhdGlvbi5sZWZ0QWRkcmVzc1NwYWNlKCkpIHsKICAgICAgICAgaWYgKGFu ZGVyRnVuY3Rpb24pCi0gICAgICAgICAgICB0eXBlQW5ub3RhdGlvbiA9IEFTVDo6TGVmdFZhbHVl IHsgKmxlZnRBZGRyZXNzU3BhY2UgfTsKKyAgICAgICAgICAgIHR5cGVBbm5vdGF0aW9uID0gQVNU OjpMZWZ0VmFsdWUgeyBkb3duY2FzdDxBU1Q6OlJlZmVyZW5jZVR5cGU+KGFuZGVyRnVuY3Rpb24t PnR5cGUoKSkuYWRkcmVzc1NwYWNlKCkgfTsKICAgICAgICAgZWxzZSBpZiAoc2V0dGVyRnVuY3Rp b24pCiAgICAgICAgICAgICB0eXBlQW5ub3RhdGlvbiA9IEFTVDo6QWJzdHJhY3RMZWZ0VmFsdWUo KTsKICAgICB9IGVsc2UgaWYgKCFiYXNlSW5mby0+dHlwZUFubm90YXRpb24uaXNSaWdodFZhbHVl KCkgJiYgKHNldHRlckZ1bmN0aW9uIHx8IHRocmVhZEFuZGVyRnVuY3Rpb24pKQpJbmRleDogTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwko cmV2aXNpb24gMjQ3OTM4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDctMzAgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBs ZS5jb20+CisKKyAgICAgICAgW1dITFNMXSBDaGVja2VyIHNldHMgd3JvbmcgdHlwZSBmb3IgcHJv cGVydHkgYWNjZXNzIGluc3RydWN0aW9uIHdpdGggYW4gYW5kZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDI4MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViZ3B1L3dobHNsL2RldmljZS1wcm9w ZXItdHlwZS1jaGVja2VyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2ViZ3B1L3do bHNsL2RldmljZS1wcm9wZXItdHlwZS1jaGVja2VyLmh0bWw6IEFkZGVkLgorCiAyMDE5LTA3LTI5 ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFlvdVR1 YmUgc2VhcmNoIGZpZWxkIHNob3dzIFJUTCB0ZXh0IG91dHNpZGUgaXRzIGJvcmRlciBvbiBpUGFk T1MKSW5kZXg6IExheW91dFRlc3RzL3dlYmdwdS93aGxzbC9kZXZpY2UtcHJvcGVyLXR5cGUtY2hl Y2tlci1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvd2ViZ3B1L3dobHNs L2RldmljZS1wcm9wZXItdHlwZS1jaGVja2VyLWV4cGVjdGVkLnR4dAkobm9uZXhpc3RlbnQpCisr KyBMYXlvdXRUZXN0cy93ZWJncHUvd2hsc2wvZGV2aWNlLXByb3Blci10eXBlLWNoZWNrZXItZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNSBAQAorUEFTUyAKK1BBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRU ZXN0cy93ZWJncHUvd2hsc2wvZGV2aWNlLXByb3Blci10eXBlLWNoZWNrZXIuaHRtbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy93ZWJncHUvd2hsc2wvZGV2aWNlLXByb3Blci10eXBlLWNoZWNr ZXIuaHRtbAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy93ZWJncHUvd2hsc2wvZGV2aWNl LXByb3Blci10eXBlLWNoZWNrZXIuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDkwIEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvd2Vi Z3B1LWZ1bmN0aW9ucy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHNjcmlwdD4KK2Nv bnN0IHNoYWRlclNvdXJjZSA9IGAKK3N0cnVjdCBQb2ludCB7CisgICAgZmxvYXQgeDsKKyAgICBm bG9hdCB5OworfQorCitbbnVtdGhyZWFkcygxLCAxLCAxKV0KK2NvbXB1dGUgdm9pZCBjb21wdXRl U2hhZGVyKGRldmljZSBQb2ludFtdIGJ1ZmZlciA6IHJlZ2lzdGVyKHUwKSwgZmxvYXQzIHRocmVh ZElEIDogU1ZfRGlzcGF0Y2hUaHJlYWRJRCkgeworICAgIGZsb2F0IHggPSBidWZmZXJbMF0ueDsK KyAgICBmbG9hdCB5ID0gYnVmZmVyWzBdLnk7CisgICAgeCArPSAxLjA7CisgICAgeSArPSAxLjA7 CisgICAgYnVmZmVyWzBdLnggPSB4OworICAgIGJ1ZmZlclswXS55ID0geTsKK30KK2A7CisKK2Fz eW5jIGZ1bmN0aW9uIHN0YXJ0KGRldmljZSkgeworICAgIGNvbnN0IHNoYWRlck1vZHVsZSA9IGRl dmljZS5jcmVhdGVTaGFkZXJNb2R1bGUoe2NvZGU6IHNoYWRlclNvdXJjZSwgaXNXSExTTDogdHJ1 ZX0pOworICAgIGNvbnN0IGNvbXB1dGVTdGFnZSA9IHttb2R1bGU6IHNoYWRlck1vZHVsZSwgZW50 cnlQb2ludDogImNvbXB1dGVTaGFkZXIifTsKKworICAgIGNvbnN0IGJpbmRHcm91cExheW91dERl c2NyaXB0b3IgPSB7YmluZGluZ3M6IFt7YmluZGluZzogMCwgdmlzaWJpbGl0eTogNywgdHlwZTog InN0b3JhZ2UtYnVmZmVyIn1dfTsKKyAgICBjb25zdCBiaW5kR3JvdXBMYXlvdXQgPSBkZXZpY2Uu Y3JlYXRlQmluZEdyb3VwTGF5b3V0KGJpbmRHcm91cExheW91dERlc2NyaXB0b3IpOworICAgIGNv bnN0IHBpcGVsaW5lTGF5b3V0RGVzY3JpcHRvciA9IHtiaW5kR3JvdXBMYXlvdXRzOiBbYmluZEdy b3VwTGF5b3V0XX07CisgICAgY29uc3QgcGlwZWxpbmVMYXlvdXQgPSBkZXZpY2UuY3JlYXRlUGlw ZWxpbmVMYXlvdXQocGlwZWxpbmVMYXlvdXREZXNjcmlwdG9yKTsKKworICAgIGNvbnN0IGNvbXB1 dGVQaXBlbGluZURlc2NyaXB0b3IgPSB7Y29tcHV0ZVN0YWdlLCBsYXlvdXQ6IHBpcGVsaW5lTGF5 b3V0fTsKKyAgICBjb25zdCBjb21wdXRlUGlwZWxpbmUgPSBkZXZpY2UuY3JlYXRlQ29tcHV0ZVBp cGVsaW5lKGNvbXB1dGVQaXBlbGluZURlc2NyaXB0b3IpOworCisgICAgY29uc3Qgc2l6ZSA9IEZs b2F0MzJBcnJheS5CWVRFU19QRVJfRUxFTUVOVCAqIDI7CisKKyAgICBjb25zdCBidWZmZXJEZXNj cmlwdG9yID0ge3NpemUsIHVzYWdlOiBHUFVCdWZmZXJVc2FnZS5NQVBfV1JJVEUgfCBHUFVCdWZm ZXJVc2FnZS5UUkFOU0ZFUl9TUkN9OworICAgIGNvbnN0IGJ1ZmZlciA9IGRldmljZS5jcmVhdGVC dWZmZXIoYnVmZmVyRGVzY3JpcHRvcik7CisgICAgY29uc3QgYnVmZmVyQXJyYXlCdWZmZXIgPSBh d2FpdCBidWZmZXIubWFwV3JpdGVBc3luYygpOworICAgIGNvbnN0IGJ1ZmZlckZsb2F0MzJBcnJh eSA9IG5ldyBGbG9hdDMyQXJyYXkoYnVmZmVyQXJyYXlCdWZmZXIpOworICAgIGJ1ZmZlckZsb2F0 MzJBcnJheVswXSA9IDQyLjA7CisgICAgYnVmZmVyRmxvYXQzMkFycmF5WzFdID0gNDMuMDsKKyAg ICBidWZmZXIudW5tYXAoKTsKKworICAgIGNvbnN0IHJlc3VsdHNCdWZmZXJEZXNjcmlwdG9yID0g e3NpemUsIHVzYWdlOiBHUFVCdWZmZXJVc2FnZS5TVE9SQUdFIHwgR1BVQnVmZmVyVXNhZ2UuVFJB TlNGRVJfRFNUIHwgR1BVQnVmZmVyVXNhZ2UuTUFQX1JFQUR9OworICAgIGNvbnN0IHJlc3VsdHNC dWZmZXIgPSBkZXZpY2UuY3JlYXRlQnVmZmVyKHJlc3VsdHNCdWZmZXJEZXNjcmlwdG9yKTsKKwor ICAgIGNvbnN0IGJ1ZmZlckJpbmRpbmcgPSB7YnVmZmVyOiByZXN1bHRzQnVmZmVyLCBzaXplfTsK KyAgICBjb25zdCBiaW5kR3JvdXBCaW5kaW5nID0ge2JpbmRpbmc6IDAsIHJlc291cmNlOiBidWZm ZXJCaW5kaW5nfTsKKyAgICBjb25zdCBiaW5kR3JvdXBEZXNjcmlwdG9yID0ge2xheW91dDogYmlu ZEdyb3VwTGF5b3V0LCBiaW5kaW5nczogW2JpbmRHcm91cEJpbmRpbmddfTsKKyAgICBjb25zdCBi aW5kR3JvdXAgPSBkZXZpY2UuY3JlYXRlQmluZEdyb3VwKGJpbmRHcm91cERlc2NyaXB0b3IpOwor CisgICAgY29uc3QgY29tbWFuZEVuY29kZXIgPSBkZXZpY2UuY3JlYXRlQ29tbWFuZEVuY29kZXIo KTsgLy8ge30KKyAgICBjb21tYW5kRW5jb2Rlci5jb3B5QnVmZmVyVG9CdWZmZXIoYnVmZmVyLCAw LCByZXN1bHRzQnVmZmVyLCAwLCBzaXplKTsKKyAgICBjb25zdCBjb21wdXRlUGFzc0VuY29kZXIg PSBjb21tYW5kRW5jb2Rlci5iZWdpbkNvbXB1dGVQYXNzKCk7CisgICAgY29tcHV0ZVBhc3NFbmNv ZGVyLnNldFBpcGVsaW5lKGNvbXB1dGVQaXBlbGluZSk7CisgICAgY29tcHV0ZVBhc3NFbmNvZGVy LnNldEJpbmRHcm91cCgwLCBiaW5kR3JvdXApOworICAgIGNvbXB1dGVQYXNzRW5jb2Rlci5kaXNw YXRjaCgxLCAxLCAxKTsKKyAgICBjb21wdXRlUGFzc0VuY29kZXIuZW5kUGFzcygpOworICAgIGNv bnN0IGNvbW1hbmRCdWZmZXIgPSBjb21tYW5kRW5jb2Rlci5maW5pc2goKTsKKyAgICBkZXZpY2Uu Z2V0UXVldWUoKS5zdWJtaXQoW2NvbW1hbmRCdWZmZXJdKTsKKworICAgIGNvbnN0IHJlc3VsdHNB cnJheUJ1ZmZlciA9IGF3YWl0IHJlc3VsdHNCdWZmZXIubWFwUmVhZEFzeW5jKCk7CisgICAgY29u c3QgcmVzdWx0c0Zsb2F0MzJBcnJheSA9IG5ldyBGbG9hdDMyQXJyYXkocmVzdWx0c0FycmF5QnVm ZmVyKTsKKyAgICBpZiAocmVzdWx0c0Zsb2F0MzJBcnJheVswXSA9PSA0My4wCisgICAgICAgICYm IHJlc3VsdHNGbG9hdDMyQXJyYXlbMV0gPT0gNDQuMCkKKyAgICAgICAgdGVzdFBhc3NlZCgiIik7 CisgICAgZWxzZQorICAgICAgICB0ZXN0RmFpbGVkKCIiKTsKKyAgICByZXN1bHRzQnVmZmVyLnVu bWFwKCk7Cit9Cit3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CitnZXRCYXNpY0RldmljZSgp LnRoZW4oZnVuY3Rpb24oZGV2aWNlKSB7CisgICAgc3RhcnQoZGV2aWNlKS50aGVuKGZ1bmN0aW9u KCkgeworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9LCBmdW5jdGlvbigpIHsKKyAgICAg ICAgdGVzdEZhaWxlZCgiIik7CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgIH0pOworfSwg ZnVuY3Rpb24oKSB7CisgICAgdGVzdFBhc3NlZCgiIik7CisgICAgZmluaXNoSlNUZXN0KCk7Cit9 KTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3Qu anMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=