[PATCH v2 0/3] MR341: vkd3d-shader/hlsl: Add constant folding for 'fract'.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov

--
  v2: vkd3d-shader/hlsl: Add constant folding for 'sat'.
      vkd3d-shader/hlsl: Add constant folding for 'exp2'.
      vkd3d-shader/hlsl: Add constant folding for 'fract'.

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/341

[PATCH v2 1/3] vkd3d-shader/hlsl: Add constant folding for 'fract'.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl_constant_ops.c | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 41a72ab6..91cc4e71 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -152,6 +152,33 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
     return true;
 }

+static bool fold_fract(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
+        const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
+{
+    enum hlsl_base_type type = dst_type->base_type;
+    unsigned int k;
+    float i;
+
+    assert(type == src->node.data_type->base_type);
+
+    for (k = 0; k < dst_type->dimx; ++k)
+    {
+        switch (type)
+        {
+            case HLSL_TYPE_FLOAT:
+            case HLSL_TYPE_HALF:
+                dst->u[k].f = modff(src->value.u[k].f, &i);
+                break;
+
+            default:
+                FIXME("Fold 'fract' for type %s.\n", debug_hlsl_type(ctx, dst_type));
+                return false;
+        }
+    }
+
+    return true;
+}
+
 static bool fold_log2(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
         const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc)
 {
@@ -912,6 +939,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             success = fold_cast(ctx, &res, instr->data_type, arg1);
             break;

+        case HLSL_OP1_FRACT:
+            success = fold_fract(ctx, &res, instr->data_type, arg1);
+            break;
+
         case HLSL_OP1_LOG2:
             success = fold_log2(ctx, &res, instr->data_type, arg1, &instr->loc);
             break;

[PATCH v2 2/3] vkd3d-shader/hlsl: Add constant folding for 'exp2'.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl_constant_ops.c | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 91cc4e71..347dc28e 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -152,6 +152,32 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
     return true;
 }

+static bool fold_exp2(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
+        const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
+{
+    enum hlsl_base_type type = dst_type->base_type;
+    unsigned int k;
+
+    assert(type == src->node.data_type->base_type);
+
+    for (k = 0; k < dst_type->dimx; ++k)
+    {
+        switch (type)
+        {
+            case HLSL_TYPE_FLOAT:
+            case HLSL_TYPE_HALF:
+                dst->u[k].f = exp2f(src->value.u[k].f);
+                break;
+
+            default:
+                FIXME("Fold 'exp2' for type %s.\n", debug_hlsl_type(ctx, dst_type));
+                return false;
+        }
+    }
+
+    return true;
+}
+
 static bool fold_fract(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
         const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
 {
@@ -939,6 +965,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             success = fold_cast(ctx, &res, instr->data_type, arg1);
             break;

+        case HLSL_OP1_EXP2:
+            success = fold_exp2(ctx, &res, instr->data_type, arg1);
+            break;
+
         case HLSL_OP1_FRACT:
             success = fold_fract(ctx, &res, instr->data_type, arg1);
             break;

[PATCH v2 3/3] vkd3d-shader/hlsl: Add constant folding for 'sat'.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 libs/vkd3d-shader/hlsl_constant_ops.c | 30 +++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c
index 347dc28e..04e72596 100644
--- a/libs/vkd3d-shader/hlsl_constant_ops.c
+++ b/libs/vkd3d-shader/hlsl_constant_ops.c
@@ -329,6 +329,32 @@ static bool fold_rcp(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons
     return true;
 }

+static bool fold_sat(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
+        const struct hlsl_ir_constant *src)
+{
+    enum hlsl_base_type type = dst_type->base_type;
+    unsigned int k;
+
+    assert(type == src->node.data_type->base_type);
+
+    for (k = 0; k < dst_type->dimx; ++k)
+    {
+        switch (type)
+        {
+            case HLSL_TYPE_FLOAT:
+            case HLSL_TYPE_HALF:
+                dst->u[k].f = min(max(0.0f, src->value.u[k].f), 1.0f);
+                break;
+
+            default:
+                FIXME("Fold 'sat' for type %s.\n", debug_hlsl_type(ctx, dst_type));
+                return false;
+        }
+    }
+
+    return true;
+}
+
 static bool fold_sqrt(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
         const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc)
 {
@@ -985,6 +1011,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
             success = fold_rcp(ctx, &res, instr->data_type, arg1, &instr->loc);
             break;

+        case HLSL_OP1_SAT:
+            success = fold_sat(ctx, &res, instr->data_type, arg1);
+            break;
+
         case HLSL_OP1_SQRT:
             success = fold_sqrt(ctx, &res, instr->data_type, arg1, &instr->loc);
             break;

[Nikolay Sivov (＠nsivov)]

On Tue Sep 12 21:25:22 2023 +0000, Nikolay Sivov wrote:
> changed this line in [version 2 of the diff](/wine/vkd3d/-/merge_requests/341/diffs?diff_id=68643&start_sha=858c3a0166c95e393450fb1d93c9725626d194e7#42d7bc823e29607ffee11286a3147a03c3ae6ce6_173_173)

Thanks. Are those existing inconsistencies? I see unquoted names for example, is that what you mean?

[Francisco Casas (＠fcasas)]

On Tue Sep 12 21:26:40 2023 +0000, Nikolay Sivov wrote:
> Thanks. Are those existing inconsistencies? I see unquoted names for
> example, is that what you mean?

Yep, I meant that we have unquoted names like
`"Fold max for type %s.\n"` quoted names like `"Fold 'sqrt' for type %s.\n"` function names like `"Fold abs() for type %s.\n"`, and nouns like `"Fold addition for type %s.\n"`, but I don't think it is very important. But for the record I like quoted ones more.

[PATCH v2 0/3] MR341: vkd3d-shader/hlsl: Add constant folding for 'fract'. - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.

[Zebediah Figura (＠zfigura)]

On Tue Sep 12 21:53:07 2023 +0000, Francisco Casas wrote:
> Yep, I meant that we have unquoted names like
> `"Fold max for type %s.\n"` quoted names like `"Fold 'sqrt' for type
> %s.\n"` function names like `"Fold abs() for type %s.\n"`, and nouns
> like `"Fold addition for type %s.\n"`, but I don't think it is very
> important. But for the record I like quoted ones more.

As long as they're debug messages I don't think it matters.

[PATCH v2 0/3] MR341: vkd3d-shader/hlsl: Add constant folding for 'fract'. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH v2 0/3] MR341: vkd3d-shader/hlsl: Add constant folding for 'fract'. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.