[PATCH v2 0/1] MR10536: vbscript: Fast-path stack_pop_bool for VT_BOOL.

[Francis De Brabandere (＠francisdb)]

Skip the expensive VariantChangeType call in stack_pop_bool when the
variant is already VT_BOOL, which is the common case after comparison
operators (OP_gt, OP_lt, OP_equal, etc.). Every If, ElseIf, While,
and Do-While condition goes through jmp_false/jmp_true which calls
stack_pop_bool, so this eliminates a redundant VT_BOOL-to-VT_BOOL
conversion on every branch.

This closed the If-condition gap from 1.5–2.1× slower than Windows down to 1.0–1.7× slower, with pure boolean tests reaching parity.

--
  v2: vbscript: Fast-path stack_pop_bool for VT_BOOL.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10536

[PATCH v2 1/1] vbscript: Fast-path stack_pop_bool for VT_BOOL.

[Francis De Brabandere]

From: Francis De Brabandere <[e-mail]>

Skip the expensive VariantChangeType call in stack_pop_bool when the
variant is already VT_BOOL, which is the common case after comparison
operators (OP_gt, OP_lt, OP_equal, etc.). Every If, ElseIf, While,
and Do-While condition goes through jmp_false/jmp_true which calls
stack_pop_bool, so this eliminates a redundant VT_BOOL-to-VT_BOOL
conversion on every branch.
---
 dlls/vbscript/interp.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index ad8ece8605d..5a5f84ed768 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -442,24 +442,28 @@ static HRESULT stack_pop_bool(exec_ctx_t *ctx, BOOL *b)
 {
     variant_val_t val;
     HRESULT hres;
-    VARIANT v;
 
     hres = stack_pop_val(ctx, &val);
     if(FAILED(hres))
         return hres;
 
-    if (V_VT(val.v) == VT_NULL)
-    {
+    switch(V_VT(val.v)) {
+    case VT_BOOL:
+        *b = !!V_BOOL(val.v);
+        break;
+    case VT_NULL:
         *b = FALSE;
-    }
-    else
-    {
+        break;
+    default: {
+        VARIANT v;
         V_VT(&v) = VT_EMPTY;
-        if (SUCCEEDED(hres = VariantChangeType(&v, val.v, VARIANT_LOCALBOOL, VT_BOOL)))
+        hres = VariantChangeType(&v, val.v, VARIANT_LOCALBOOL, VT_BOOL);
+        if(SUCCEEDED(hres))
             *b = !!V_BOOL(&v);
+        release_val(&val);
+        break;
+    }
     }
-
-    release_val(&val);
 
     return hres;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10536

[PATCH v2 0/1] MR10536: vbscript: Fast-path stack_pop_bool for VT_BOOL. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10536