200525 2019-08-07 17:39:41 -0700 [WHLSL] Trivial clean-up of the MSL code generated 2019-08-21 10:46:13 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=200961 InRadar P2 Normal --- 1 rmorisset rmorisset commit-queue darin ews-watchlist mmaxfield webkit-bug-importer oldest_to_newest 1559399 0 rmorisset 2019-08-07 17:39:41 -0700 We emit some redundant '{}' around function bodies (we emit them both when visiting the function definition itself and the block). We also emit some branch for ternary expressions instead of just using a ternary. 1559400 1 375771 rmorisset 2019-08-07 17:42:55 -0700 Created attachment 375771 Patch 1559923 2 375771 darin 2019-08-09 09:59:43 -0700 Comment on attachment 375771 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375771&action=review > Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp:253 > + m_stringBuilder.append("\n"); I think that appending a single character is slightly more efficient if you use the character: append('\n') 1560883 3 376190 rmorisset 2019-08-13 11:50:29 -0700 Created attachment 376190 Patch for landing 1561623 4 376190 commit-queue 2019-08-15 10:49:45 -0700 Comment on attachment 376190 Patch for landing Clearing flags on attachment: 376190 Committed r248729: <https://trac.webkit.org/changeset/248729> 1561624 5 commit-queue 2019-08-15 10:49:46 -0700 All reviewed patches have been landed. Closing bug. 1561625 6 webkit-bug-importer 2019-08-15 10:50:22 -0700 <rdar://problem/54353040> 1563551 7 rmorisset 2019-08-21 10:46:13 -0700 The ternary part of this patch was just wrong because of effects. See https://bugs.webkit.org/show_bug.cgi?id=200961 375771 2019-08-07 17:42:55 -0700 2019-08-13 11:50:29 -0700 Patch patch200525 text/plain 2852 rmorisset ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NGI1MWY0NWUxMC4uNTQ2ZjYyZTE1ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0wOC0wNyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFtXSExTTF0gVHJpdmlhbCBjbGVhbi11cCBvZiB0aGUgTVNMIGNvZGUg Z2VuZXJhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDA1MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbWl0IHNpbXBsZXIgY29kZSBmb3IgdGVybmFyeSBleHByZXNzaW9ucworICAgICAgICBSZW1v dmUgZHVwbGljYXRlIHt9IGFyb3VuZCBmdW5jdGlvbnMKKworICAgICAgICBObyBuZXcgdGVzdHMg YXMgaXQgaXMgY292ZXJlZCBieSB0aGUgZXhpc3Rpbmcgb25lcy4KKworICAgICAgICAqIE1vZHVs ZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V0hMU0w6Ok1ldGFsOjpGdW5jdGlvbkRlZmluaXRpb25Xcml0ZXI6OnZpc2l0KToK KwogMjAxOS0wOC0wNSAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAg ICAgICAgIFtXSExTTF0gU2ltcGxpZnkgYW5kIGVsaW1pbmF0ZSByZWR1bmRhbnQgd29yayBpbiBX SExTTEZ1bmN0aW9uV3JpdGVyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTEZ1bmN0aW9uV3JpdGVyLmNwcApp bmRleCBjYTM0NmUzMmIyOS4uNjZhYTg1NTZiMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25X cml0ZXIuY3BwCkBAIC0yNDcsMTAgKzI0NywxMCBAQCB2b2lkIEZ1bmN0aW9uRGVmaW5pdGlvbldy aXRlcjo6dmlzaXQoQVNUOjpGdW5jdGlvbkRlZmluaXRpb24mIGZ1bmN0aW9uRGVmaW5pdGlvbgog ICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChhZGRSZXN1bHQsIGFkZFJlc3VsdC5pc05ld0VudHJ5 KTsKICAgICAgICAgICAgIG1fc3RyaW5nQnVpbGRlci5mbGV4aWJsZUFwcGVuZChtX3R5cGVOYW1l ci5tYW5nbGVkTmFtZUZvclR5cGUoKnBhcmFtZXRlci0+dHlwZSgpKSwgJyAnLCBwYXJhbWV0ZXJO YW1lKTsKICAgICAgICAgfQotICAgICAgICBtX3N0cmluZ0J1aWxkZXIuYXBwZW5kKCIpIHtcbiIp OworICAgICAgICBtX3N0cmluZ0J1aWxkZXIuYXBwZW5kKCIpXG4iKTsKICAgICAgICAgY2hlY2tF cnJvckFuZFZpc2l0KGZ1bmN0aW9uRGVmaW5pdGlvbi5ibG9jaygpKTsKICAgICAgICAgQVNTRVJU KG1fc3RhY2suaXNFbXB0eSgpKTsKLSAgICAgICAgbV9zdHJpbmdCdWlsZGVyLmFwcGVuZCgifVxu Iik7CisgICAgICAgIG1fc3RyaW5nQnVpbGRlci5hcHBlbmQoIlxuIik7CiAgICAgfQogfQogCkBA IC02ODYsMjIgKzY4NiwxMyBAQCB2b2lkIEZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcjo6dmlzaXQo QVNUOjpUZXJuYXJ5RXhwcmVzc2lvbiYgdGVybmFyeUV4cHJlc3Npb24pCiB7CiAgICAgY2hlY2tF cnJvckFuZFZpc2l0KHRlcm5hcnlFeHByZXNzaW9uLnByZWRpY2F0ZSgpKTsKICAgICBhdXRvIGNo ZWNrID0gdGFrZUxhc3RWYWx1ZSgpOwotCi0gICAgYXV0byB2YXJpYWJsZU5hbWUgPSBnZW5lcmF0 ZU5leHRWYXJpYWJsZU5hbWUoKTsKLSAgICBtX3N0cmluZ0J1aWxkZXIuZmxleGlibGVBcHBlbmQo Ci0gICAgICAgIG1fdHlwZU5hbWVyLm1hbmdsZWROYW1lRm9yVHlwZSh0ZXJuYXJ5RXhwcmVzc2lv bi5yZXNvbHZlZFR5cGUoKSksICcgJywgdmFyaWFibGVOYW1lLCAiO1xuIgotICAgICAgICAiaWYg KCIsIGNoZWNrLCAiKSB7XG4iCi0gICAgKTsKICAgICBjaGVja0Vycm9yQW5kVmlzaXQodGVybmFy eUV4cHJlc3Npb24uYm9keUV4cHJlc3Npb24oKSk7Ci0gICAgbV9zdHJpbmdCdWlsZGVyLmZsZXhp YmxlQXBwZW5kKAotICAgICAgICB2YXJpYWJsZU5hbWUsICIgPSAiLCB0YWtlTGFzdFZhbHVlKCks ICI7XG4iCi0gICAgICAgICJ9IGVsc2Uge1xuIgotICAgICk7CisgICAgYXV0byBib2R5ID0gdGFr ZUxhc3RWYWx1ZSgpOwogICAgIGNoZWNrRXJyb3JBbmRWaXNpdCh0ZXJuYXJ5RXhwcmVzc2lvbi5l bHNlRXhwcmVzc2lvbigpKTsKLSAgICBtX3N0cmluZ0J1aWxkZXIuZmxleGlibGVBcHBlbmQoCi0g ICAgICAgIHZhcmlhYmxlTmFtZSwgIiA9ICIsIHRha2VMYXN0VmFsdWUoKSwgIjtcbiIKLSAgICAg ICAgIn1cbiIKLSAgICApOworICAgIGF1dG8gZWxzZUJvZHkgPSB0YWtlTGFzdFZhbHVlKCk7CisK KyAgICBhdXRvIHZhcmlhYmxlTmFtZSA9IGdlbmVyYXRlTmV4dFZhcmlhYmxlTmFtZSgpOworICAg IG1fc3RyaW5nQnVpbGRlci5mbGV4aWJsZUFwcGVuZChtX3R5cGVOYW1lci5tYW5nbGVkTmFtZUZv clR5cGUodGVybmFyeUV4cHJlc3Npb24ucmVzb2x2ZWRUeXBlKCkpLCAnICcsIHZhcmlhYmxlTmFt ZSwgIiA9ICIsIGNoZWNrLCAiID8gIiwgYm9keSwgIiA6ICIsIGVsc2VCb2R5LCAiO1xuIik7CiAg ICAgYXBwZW5kUmlnaHRWYWx1ZSh0ZXJuYXJ5RXhwcmVzc2lvbiwgdmFyaWFibGVOYW1lKTsKIH0K IAo= 376190 2019-08-13 11:50:29 -0700 2019-08-15 10:49:45 -0700 Patch for landing patch200525 text/plain 2849 rmorisset ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NGI1MWY0NWUxMC4uNTQ2ZjYyZTE1ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0wOC0wNyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFtXSExTTF0gVHJpdmlhbCBjbGVhbi11cCBvZiB0aGUgTVNMIGNvZGUg Z2VuZXJhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDA1MjUKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBF bWl0IHNpbXBsZXIgY29kZSBmb3IgdGVybmFyeSBleHByZXNzaW9ucworICAgICAgICBSZW1vdmUg ZHVwbGljYXRlIHt9IGFyb3VuZCBmdW5jdGlvbnMKKworICAgICAgICBObyBuZXcgdGVzdHMgYXMg aXQgaXMgY292ZXJlZCBieSB0aGUgZXhpc3Rpbmcgb25lcy4KKworICAgICAgICAqIE1vZHVsZXMv d2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6V0hMU0w6Ok1ldGFsOjpGdW5jdGlvbkRlZmluaXRpb25Xcml0ZXI6OnZpc2l0KToKKwog MjAxOS0wOC0wNSAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29tPgogCiAgICAg ICAgIFtXSExTTF0gU2ltcGxpZnkgYW5kIGVsaW1pbmF0ZSByZWR1bmRhbnQgd29yayBpbiBXSExT TEZ1bmN0aW9uV3JpdGVyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJncHUvV0hMU0wvTWV0YWwvV0hMU0xGdW5jdGlvbldyaXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmdwdS9XSExTTC9NZXRhbC9XSExTTEZ1bmN0aW9uV3JpdGVyLmNwcAppbmRl eCBjYTM0NmUzMmIyOS4uNjZhYTg1NTZiMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZ3B1L1dITFNML01ldGFsL1dITFNMRnVuY3Rpb25Xcml0 ZXIuY3BwCkBAIC0yNDcsMTAgKzI0NywxMCBAQCB2b2lkIEZ1bmN0aW9uRGVmaW5pdGlvbldyaXRl cjo6dmlzaXQoQVNUOjpGdW5jdGlvbkRlZmluaXRpb24mIGZ1bmN0aW9uRGVmaW5pdGlvbgogICAg ICAgICAgICAgQVNTRVJUX1VOVVNFRChhZGRSZXN1bHQsIGFkZFJlc3VsdC5pc05ld0VudHJ5KTsK ICAgICAgICAgICAgIG1fc3RyaW5nQnVpbGRlci5mbGV4aWJsZUFwcGVuZChtX3R5cGVOYW1lci5t YW5nbGVkTmFtZUZvclR5cGUoKnBhcmFtZXRlci0+dHlwZSgpKSwgJyAnLCBwYXJhbWV0ZXJOYW1l KTsKICAgICAgICAgfQotICAgICAgICBtX3N0cmluZ0J1aWxkZXIuYXBwZW5kKCIpIHtcbiIpOwor ICAgICAgICBtX3N0cmluZ0J1aWxkZXIuYXBwZW5kKCIpXG4iKTsKICAgICAgICAgY2hlY2tFcnJv ckFuZFZpc2l0KGZ1bmN0aW9uRGVmaW5pdGlvbi5ibG9jaygpKTsKICAgICAgICAgQVNTRVJUKG1f c3RhY2suaXNFbXB0eSgpKTsKLSAgICAgICAgbV9zdHJpbmdCdWlsZGVyLmFwcGVuZCgifVxuIik7 CisgICAgICAgIG1fc3RyaW5nQnVpbGRlci5hcHBlbmQoJ1xuJyk7CiAgICAgfQogfQogCkBAIC02 ODYsMjIgKzY4NiwxMyBAQCB2b2lkIEZ1bmN0aW9uRGVmaW5pdGlvbldyaXRlcjo6dmlzaXQoQVNU OjpUZXJuYXJ5RXhwcmVzc2lvbiYgdGVybmFyeUV4cHJlc3Npb24pCiB7CiAgICAgY2hlY2tFcnJv ckFuZFZpc2l0KHRlcm5hcnlFeHByZXNzaW9uLnByZWRpY2F0ZSgpKTsKICAgICBhdXRvIGNoZWNr ID0gdGFrZUxhc3RWYWx1ZSgpOwotCi0gICAgYXV0byB2YXJpYWJsZU5hbWUgPSBnZW5lcmF0ZU5l eHRWYXJpYWJsZU5hbWUoKTsKLSAgICBtX3N0cmluZ0J1aWxkZXIuZmxleGlibGVBcHBlbmQoCi0g ICAgICAgIG1fdHlwZU5hbWVyLm1hbmdsZWROYW1lRm9yVHlwZSh0ZXJuYXJ5RXhwcmVzc2lvbi5y ZXNvbHZlZFR5cGUoKSksICcgJywgdmFyaWFibGVOYW1lLCAiO1xuIgotICAgICAgICAiaWYgKCIs IGNoZWNrLCAiKSB7XG4iCi0gICAgKTsKICAgICBjaGVja0Vycm9yQW5kVmlzaXQodGVybmFyeUV4 cHJlc3Npb24uYm9keUV4cHJlc3Npb24oKSk7Ci0gICAgbV9zdHJpbmdCdWlsZGVyLmZsZXhpYmxl QXBwZW5kKAotICAgICAgICB2YXJpYWJsZU5hbWUsICIgPSAiLCB0YWtlTGFzdFZhbHVlKCksICI7 XG4iCi0gICAgICAgICJ9IGVsc2Uge1xuIgotICAgICk7CisgICAgYXV0byBib2R5ID0gdGFrZUxh c3RWYWx1ZSgpOwogICAgIGNoZWNrRXJyb3JBbmRWaXNpdCh0ZXJuYXJ5RXhwcmVzc2lvbi5lbHNl RXhwcmVzc2lvbigpKTsKLSAgICBtX3N0cmluZ0J1aWxkZXIuZmxleGlibGVBcHBlbmQoCi0gICAg ICAgIHZhcmlhYmxlTmFtZSwgIiA9ICIsIHRha2VMYXN0VmFsdWUoKSwgIjtcbiIKLSAgICAgICAg In1cbiIKLSAgICApOworICAgIGF1dG8gZWxzZUJvZHkgPSB0YWtlTGFzdFZhbHVlKCk7CisKKyAg ICBhdXRvIHZhcmlhYmxlTmFtZSA9IGdlbmVyYXRlTmV4dFZhcmlhYmxlTmFtZSgpOworICAgIG1f c3RyaW5nQnVpbGRlci5mbGV4aWJsZUFwcGVuZChtX3R5cGVOYW1lci5tYW5nbGVkTmFtZUZvclR5 cGUodGVybmFyeUV4cHJlc3Npb24ucmVzb2x2ZWRUeXBlKCkpLCAnICcsIHZhcmlhYmxlTmFtZSwg IiA9ICIsIGNoZWNrLCAiID8gIiwgYm9keSwgIiA6ICIsIGVsc2VCb2R5LCAiO1xuIik7CiAgICAg YXBwZW5kUmlnaHRWYWx1ZSh0ZXJuYXJ5RXhwcmVzc2lvbiwgdmFyaWFibGVOYW1lKTsKIH0KIAo=