125653 2013-12-12 14:05:16 -0800 CStack Branch: Eliminate unnecessary add/sub 16 to stack pointer 2013-12-12 16:15:59 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff oldest_to_newest 959334 0 msaboff 2013-12-12 14:05:16 -0800 The DFG call out code constructs a new callee frame relative to the stack pointer. Currently before making a call, it decrements the stack pointer by 16 to have it point above the returnPC and caller frame slots. Instead, the stack pointer should be set properly at the top of the function so that the callee frame above the returnPC can be constructed relative to the stack pointer and then issue a call without adjusting the stack pointer. 959351 1 219122 msaboff 2013-12-12 14:51:05 -0800 Created attachment 219122 Patch 959353 2 msaboff 2013-12-12 14:52:21 -0800 Landed in 160506 on the jsCStack branch: <http://trac.webkit.org/160506> 959377 3 219122 ggaren 2013-12-12 15:30:57 -0800 Comment on attachment 219122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219122&action=review r=me > Source/JavaScriptCore/dfg/DFGGraph.cpp:706 > + unsigned result = m_nextMachineLocal + std::max(m_parameterSlots, (unsigned)JSStack::CallerFrameAndPCSize); static_cast, please. > Source/JavaScriptCore/dfg/DFGGraph.cpp:707 > result += result & 1; // Align the register count This would be better expressed as "result = roundUpToMultipleOf<stackAlignment>(result);", and no comment. > Source/JavaScriptCore/llint/LowLevelInterpreter.asm:44 > +const CallerFrameAndPCSize = 2 * PtrSize Please add an ASSERT for this to LLIntData.cpp. 959391 4 msaboff 2013-12-12 16:15:59 -0800 Changes from review landed in 160514 on the jsCStack branch: <http://trac.webkit.org/160514 > 219122 2013-12-12 14:51:05 -0800 2013-12-12 15:30:57 -0800 Patch 125653.patch text/plain 6915 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwNTA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDEzLTEyLTEyICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIENTdGFjayBCcmFuY2g6IEVsaW1pbmF0ZSB1bm5lY2Vzc2FyeSBhZGQvc3ViIDE2IHRvIHN0 YWNrIHBvaW50ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyNTY1MworCisgICAgICAgIE5vdCB5ZXQgcmV2aWV3ZWQuCisKKyAgICAgICAgQ2hhbmdl ZCB0aGUgREZHIHN0YWNrIGZyYW1lIHRvIGluY2x1ZGUgb3V0Z29pbmcgc3BhY2UgZm9yIGF0IGxl YXN0IHRoZSB0d28KKyAgICAgICAgcG9pbnRlcnMgZm9yIHJldHVyblBDIGFuZCBjYWxsZXJGcmFt ZS4gIENoYW5nZWQgdGhlIHNldHRpbmcgb2YgdGhlIHN0YWNrCisgICAgICAgIHBvaW50ZXIgdG8g bm90IGluY2x1ZGUgdGhlIHNwYWNlIGZvciB0aGUgb3V0Z29pbmcgcmV0dXJuUEMgYW5kIGNhbGxl ckZyYW1lLgorICAgICAgICBFbGltaW5hdGVkIHRoZSBhZGQvc3ViIDE2IGFyb3VuZCBjYWxscyBp biB0aGUgREZHLiAgCisKKyAgICAgICAgQWRqdXN0ZWQgdGhlIExMSW50IGFuZCBiYXNlbGluZSBK SVQgY2FsY3VsYXRpb24gb2YgdGhlIHN0YWNrIHBvaW50ZXIgZm9yIGNhbGxzLiAKKyAgICAgICAg SW4gYm90aCBjYXNlcywgdGhlIGZyYW1lIGlzIHNldCB1cCB3aXRoIHRlbXAgdGhhdCBwb2ludHMg dG8gdGhlIGJhc2Ugb2YgdGhlIGNhbGxlZQorICAgICAgICBmcmFtZS4gIFRoZSBzcGFjZSBmb3Ig dGhlIG91dGdvaW5nIHJldHVyblBDIGFuZCBjYWxsZXJGcmFtZSBpcyBhZGRlZCB0byB0aGUgdGVt cCAKKyAgICAgICAgdG8gY3JlYXRlIHRoZSBzdGFjayBwb2ludGVyIGZvciB0aGUgY2FsbC4KKwor ICAgICAgICAqIGRmZy9ERkdHcmFwaC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6R3JhcGg6OmZy YW1lUmVnaXN0ZXJDb3VudCk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3Bw OgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbCk6CisgICAgICAg ICogaW50ZXJwcmV0ZXIvSlNTdGFjay5oOgorICAgICAgICAqIGppdC9KSVRDYWxsLmNwcDoKKyAg ICAgICAgKEpTQzo6SklUOjpjb21waWxlT3BDYWxsKToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZl bEludGVycHJldGVyLmFzbToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQu YXNtOgorCiAyMDEzLTEyLTEyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBGaXggaGFuZGxpbmcgb2YgdW5jYXVnaHQgZXhjZXB0aW9ucy4KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHR3JhcGguY3BwCShyZXZpc2lvbiAxNjA1MDUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzAzLDcg KzcwMyw3IEBAIGJvb2wgR3JhcGg6OmlzTGl2ZUluQnl0ZWNvZGUoVmlydHVhbFJlZ2kKIAogdW5z aWduZWQgR3JhcGg6OmZyYW1lUmVnaXN0ZXJDb3VudCgpCiB7Ci0gICAgdW5zaWduZWQgcmVzdWx0 ID0gbV9uZXh0TWFjaGluZUxvY2FsICsgbV9wYXJhbWV0ZXJTbG90czsKKyAgICB1bnNpZ25lZCBy ZXN1bHQgPSBtX25leHRNYWNoaW5lTG9jYWwgKyBzdGQ6Om1heChtX3BhcmFtZXRlclNsb3RzLCAo dW5zaWduZWQpSlNTdGFjazo6Q2FsbGVyRnJhbWVBbmRQQ1NpemUpOwogICAgIHJlc3VsdCArPSBy ZXN1bHQgJiAxOyAvLyBBbGlnbiB0aGUgcmVnaXN0ZXIgY291bnQKICAgICByZXR1cm4gcmVzdWx0 OwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklUNjQuY3BwCShyZXZpc2lvbiAxNjA1MDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MTQsMjQgKzcx NCwxNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjplbWl0Q2FsbChOb2RlKiBub2RlCiAgICAgbV9q aXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhjYWxsZWVHUFIsIE9CSkVDVF9PRkZT RVRPRihKU0Z1bmN0aW9uLCBtX3Njb3BlKSksIHJlc3VsdEdQUik7CiAgICAgbV9qaXQuc3RvcmU2 NChyZXN1bHRHUFIsIGNhbGxlZUZyYW1lU2xvdChKU1N0YWNrOjpTY29wZUNoYWluKSk7CiAKLSAg ICAvLyBGSVhNRTogQ1N0YWNrIC0gcmVtb3ZlIHRoZSBhZGQvc3ViIDE2IGJlZm9yZSBhbmQgYWZ0 ZXIgY2FsbC4KLSAgICBtX2ppdC5hZGRQdHIoVHJ1c3RlZEltbTMyKDE2KSwgTWFjcm9Bc3NlbWJs ZXI6OnN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKLSAgICAKICAgICBKSVRDb21waWxlcjo6Q2FsbCBm YXN0Q2FsbCA9IG1faml0Lm5lYXJDYWxsKCk7CiAKICAgICBKSVRDb21waWxlcjo6SnVtcCBkb25l ID0gbV9qaXQuanVtcCgpOwogICAgIAogICAgIHNsb3dQYXRoLmxpbmsoJm1faml0KTsKICAgICAK LSAgICBtX2ppdC5hZGRQdHIoVHJ1c3RlZEltbTMyKDE2KSwgTWFjcm9Bc3NlbWJsZXI6OnN0YWNr UG9pbnRlclJlZ2lzdGVyKTsKLSAgICAKICAgICBtX2ppdC5tb3ZlKGNhbGxlZUdQUiwgR1BSSW5m bzo6cmVnVDApOyAvLyBDYWxsZWUgbmVlZHMgdG8gYmUgaW4gcmVnVDAKICAgICBKSVRDb21waWxl cjo6Q2FsbCBzbG93Q2FsbCA9IG1faml0Lm5lYXJDYWxsKCk7CiAgICAgCiAgICAgZG9uZS5saW5r KCZtX2ppdCk7CiAgICAgCi0gICAgbV9qaXQuYWRkUHRyKFRydXN0ZWRJbW0zMigtMTYpLCBNYWNy b0Fzc2VtYmxlcjo6c3RhY2tQb2ludGVyUmVnaXN0ZXIpOwotICAgIAogICAgIG1faml0Lm1vdmUo R1BSSW5mbzo6cmV0dXJuVmFsdWVHUFIsIHJlc3VsdEdQUik7CiAgICAgCiAgICAganNWYWx1ZVJl c3VsdChyZXN1bHRHUFIsIG1fY3VycmVudE5vZGUsIERhdGFGb3JtYXRKUywgVXNlQ2hpbGRyZW5D YWxsZWRFeHBsaWNpdGx5KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRl ci9KU1N0YWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJl dGVyL0pTU3RhY2suaAkocmV2aXNpb24gMTYwNTA1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2ludGVycHJldGVyL0pTU3RhY2suaAkod29ya2luZyBjb3B5KQpAQCAtNjEsOCArNjEsOCBAQCBu YW1lc3BhY2UgSlNDIHsKICAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoSlNTdGFjayk7CiAg ICAgcHVibGljOgogICAgICAgICBlbnVtIENhbGxGcmFtZUhlYWRlckVudHJ5IHsKLSAgICAgICAg ICAgIENhbGxlckZyYW1lQW5kUENTaXplID0gMCwKLSAgICAgICAgICAgIENvZGVCbG9jayA9IHNp emVvZihDYWxsZXJGcmFtZUFuZFBDKSAvIHNpemVvZihSZWdpc3RlciksCisgICAgICAgICAgICBD YWxsZXJGcmFtZUFuZFBDU2l6ZSA9IHNpemVvZihDYWxsZXJGcmFtZUFuZFBDKSAvIHNpemVvZihS ZWdpc3RlciksCisgICAgICAgICAgICBDb2RlQmxvY2sgPSBDYWxsZXJGcmFtZUFuZFBDU2l6ZSwK ICAgICAgICAgICAgIFNjb3BlQ2hhaW4sCiAgICAgICAgICAgICBDYWxsZWUsCiAgICAgICAgICAg ICBBcmd1bWVudENvdW50LApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRDYWxs LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENhbGwuY3Bw CShyZXZpc2lvbiAxNjA1MDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVENhbGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTgsNyArMTk4LDcgQEAgdm9pZCBKSVQ6OmNvbXBpbGVP cENhbGwoT3Bjb2RlSUQgb3Bjb2RlSQogCiAgICAgbG9hZFB0cihBZGRyZXNzKHJlZ1QwLCBPQkpF Q1RfT0ZGU0VUT0YoSlNGdW5jdGlvbiwgbV9zY29wZSkpLCByZWdUMik7CiAgICAgc3RvcmU2NChy ZWdUMiwgQWRkcmVzcyhyZWdUMSwgSlNTdGFjazo6U2NvcGVDaGFpbiAqIHNpemVvZihSZWdpc3Rl cikpKTsKLSAgICBhZGRQdHIoVHJ1c3RlZEltbTMyKDE2KSwgcmVnVDEsIHN0YWNrUG9pbnRlclJl Z2lzdGVyKTsKKyAgICBhZGRQdHIoVHJ1c3RlZEltbTMyKEpTU3RhY2s6OkNhbGxlckZyYW1lQW5k UENTaXplICogc3RhdGljX2Nhc3Q8aW50PihzaXplb2YoUmVnaXN0ZXIpKSksIHJlZ1QxLCBzdGFj a1BvaW50ZXJSZWdpc3Rlcik7CiAKICAgICBtX2NhbGxTdHJ1Y3R1cmVTdHViQ29tcGlsYXRpb25J bmZvW2NhbGxMaW5rSW5mb0luZGV4XS5ob3RQYXRoT3RoZXIgPSBlbWl0TmFrZWRDYWxsKCk7CiAK SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQu YXNtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbElu dGVycHJldGVyNjQuYXNtCShyZXZpc2lvbiAxNjA1MDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFzbQkod29ya2luZyBjb3B5KQpAQCAtMTUy LDEwICsxNTIsNiBAQCBtYWNybyBtb3ZlU3RhY2tQb2ludGVyRm9yQ2FsbGZyYW1lKGNvZGViCiAg ICAgc3VicCBjZnIsIHQxLCBzcAogZW5kCiAKLW1hY3JvIHByZXBhcmVTdGFja1BvaW50ZXJGb3JK U0NhbGwoY2FsbGVlRnJhbWVQdHIpCi0gICAgYWRkcCAxNiwgY2FsbGVlRnJhbWVQdHIsIHNwCi1l bmQKLQogbWFjcm8gcmVzdG9yZVN0YWNrUG9pbnRlckFmdGVySlNDYWxsKCkKICAgICBsb2FkcCBD b2RlQmxvY2tbY2ZyXSwgdDEKICAgICBsb2FkaSBDb2RlQmxvY2s6Om1fbnVtQ2FsbGVlUmVnaXN0 ZXJzW3QxXSwgdDEKQEAgLTE3NDgsNiArMTc0NCw3IEBAIG1hY3JvIGRvQ2FsbChzbG93UGF0aCkK ICAgICBsb2FkaXNGcm9tSW5zdHJ1Y3Rpb24oMywgdDIpCiAgICAgc3RvcmVpIFBDLCBBcmd1bWVu dENvdW50ICsgVGFnT2Zmc2V0W2Nmcl0KICAgICBzdG9yZWkgdDIsIEFyZ3VtZW50Q291bnQgKyBQ YXlsb2FkT2Zmc2V0W3QzXQorICAgIGFkZHAgQ2FsbGVyRnJhbWVBbmRQQ1NpemUsIHQzCiAgICAg Y2FsbFRhcmdldEZ1bmN0aW9uKHQxLHQzKQogCiAub3BDYWxsU2xvdzoKSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmFzbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5hc20JKHJl dmlzaW9uIDE2MDUwNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbElu dGVycHJldGVyLmFzbQkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsOCBAQCBjb25zdCBDYWxs RnJhbWVIZWFkZXJTbG90cyA9IDUKIGVuZAogY29uc3QgU2xvdFNpemUgPSA4CiAKK2NvbnN0IENh bGxlckZyYW1lQW5kUENTaXplID0gMiAqIFB0clNpemUKKwogY29uc3QgQ2FsbGVyRnJhbWUgPSAw CiBjb25zdCBSZXR1cm5QQyA9IENhbGxlckZyYW1lICsgUHRyU2l6ZQogY29uc3QgQ29kZUJsb2Nr ID0gUmV0dXJuUEMgKyBQdHJTaXplCkBAIC0yNjQsNyArMjY2LDcgQEAgbWFjcm8gY2FsbFRhcmdl dEZ1bmN0aW9uKGNhbGxMaW5rSW5mbywgYwogICAgIGlmIENfTE9PUAogICAgICAgICBjbG9vcENh bGxKU0Z1bmN0aW9uIExMSW50Q2FsbExpbmtJbmZvOjptYWNoaW5lQ29kZVRhcmdldFtjYWxsTGlu a0luZm9dCiAgICAgZWxzZQotICAgICAgICBwcmVwYXJlU3RhY2tQb2ludGVyRm9ySlNDYWxsKGNh bGxlZUZyYW1lUHRyKQorICAgICAgICBtb3ZlIGNhbGxlZUZyYW1lUHRyLCBzcAogICAgICAgICBj YWxsIExMSW50Q2FsbExpbmtJbmZvOjptYWNoaW5lQ29kZVRhcmdldFtjYWxsTGlua0luZm9dCiAg ICAgICAgIHJlc3RvcmVTdGFja1BvaW50ZXJBZnRlckpTQ2FsbCgpCiAgICAgICAgIGRpc3BhdGNo QWZ0ZXJDYWxsKCkKQEAgLTI3OCw3ICsyODAsNyBAQCBtYWNybyBzbG93UGF0aEZvckNhbGwoc2xv d1BhdGgpCiAgICAgICAgICAgICBpZiBDX0xPT1AKICAgICAgICAgICAgICAgICBjbG9vcENhbGxK U0Z1bmN0aW9uIGNhbGxlZQogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHByZXBh cmVTdGFja1BvaW50ZXJGb3JKU0NhbGwodDEpICMgVGhlIHNsb3cgcGF0Y2ggbGVhdmVzIHRoZSBj YWxsZSBFeGVjU3RhdGUqIGluIHQxCisgICAgICAgICAgICAgICAgYWRkcCBDYWxsZXJGcmFtZUFu ZFBDU2l6ZSwgdDEsIHNwCiAgICAgICAgICAgICAgICAgY2FsbCBjYWxsZWUKICAgICAgICAgICAg ICAgICByZXN0b3JlU3RhY2tQb2ludGVyQWZ0ZXJKU0NhbGwoKQogICAgICAgICAgICAgICAgIGRp c3BhdGNoQWZ0ZXJDYWxsKCkK