Mesa (master): lima/ppir: support ppir_op_ceil

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 56230f042831785c085c07ed1b5fa0f0b27848bc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=56230f042831785c085c07ed1b5fa0f0b27848bc

Author: Erico Nunes <nunes.erico at gmail.com>
Date:   Tue Apr 16 23:21:24 2019 +0200

lima/ppir: support ppir_op_ceil

Add a few missing ppir_op_ceil enum handling entries to implement
nir_op_fceil in lima ppir.

Signed-off-by: Erico Nunes <nunes.erico at gmail.com>
Reviewed-by: Vasily Khoruzhick <anarsoul at gmail.com>
Reviewed-by: Qiang Yu <yuq825 at gmail.com>

---

 src/gallium/drivers/lima/ir/pp/codegen.c | 6 ++++++
 src/gallium/drivers/lima/ir/pp/nir.c     | 1 +
 src/gallium/drivers/lima/ir/pp/node.c    | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/src/gallium/drivers/lima/ir/pp/codegen.c b/src/gallium/drivers/lima/ir/pp/codegen.c
index 1cce28595e6..23d9a7aa41b 100644
--- a/src/gallium/drivers/lima/ir/pp/codegen.c
+++ b/src/gallium/drivers/lima/ir/pp/codegen.c
@@ -300,6 +300,9 @@ static void ppir_codegen_encode_vec_add(ppir_node *node, void *code)
    case ppir_op_floor:
       f->op = ppir_codegen_vec4_acc_op_floor;
       break;
+   case ppir_op_ceil:
+      f->op = ppir_codegen_vec4_acc_op_ceil;
+      break;
    case ppir_op_fract:
       f->op = ppir_codegen_vec4_acc_op_fract;
       break;
@@ -373,6 +376,9 @@ static void ppir_codegen_encode_scl_add(ppir_node *node, void *code)
    case ppir_op_floor:
       f->op = ppir_codegen_float_acc_op_floor;
       break;
+   case ppir_op_ceil:
+      f->op = ppir_codegen_float_acc_op_ceil;
+      break;
    case ppir_op_fract:
       f->op = ppir_codegen_float_acc_op_fract;
       break;
diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c
index 669c632b96a..a962a2b776f 100644
--- a/src/gallium/drivers/lima/ir/pp/nir.c
+++ b/src/gallium/drivers/lima/ir/pp/nir.c
@@ -134,6 +134,7 @@ static int nir_to_ppir_opcodes[nir_num_opcodes] = {
    [nir_op_fmin] = ppir_op_min,
    [nir_op_frcp] = ppir_op_rcp,
    [nir_op_ffloor] = ppir_op_floor,
+   [nir_op_fceil] = ppir_op_ceil,
    [nir_op_ffract] = ppir_op_fract,
    [nir_op_fand] = ppir_op_and,
    [nir_op_for] = ppir_op_or,
diff --git a/src/gallium/drivers/lima/ir/pp/node.c b/src/gallium/drivers/lima/ir/pp/node.c
index 9c871abb4c9..0f4cacb33a1 100644
--- a/src/gallium/drivers/lima/ir/pp/node.c
+++ b/src/gallium/drivers/lima/ir/pp/node.c
@@ -131,6 +131,13 @@ const ppir_op_info ppir_op_infos[] = {
          PPIR_INSTR_SLOT_END
       },
    },
+   [ppir_op_ceil] = {
+      .name = "ceil",
+      .slots = (int []) {
+         PPIR_INSTR_SLOT_ALU_SCL_ADD, PPIR_INSTR_SLOT_ALU_VEC_ADD,
+         PPIR_INSTR_SLOT_END
+      },
+   },
    [ppir_op_fract] = {
       .name = "fract",
       .slots = (int []) {