From 5ee0adfb6eba2407c1046f3cdb70bf43e6383634 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Mon, 3 Dec 2018 19:08:41 +0100 Subject: [PATCH] nir/spirv: handle ContractionOff execution mode Signed-off-by: Karol Herbst Reviewed-by: Jason Ekstrand Reviewed-by: Bas Nieuwenhuizen --- src/compiler/spirv/spirv_info.h | 1 + src/compiler/spirv/spirv_info_c.py | 1 + src/compiler/spirv/spirv_to_nir.c | 9 ++++++++- src/compiler/spirv/vtn_alu.c | 4 ++-- src/compiler/spirv/vtn_cfg.c | 2 ++ src/compiler/spirv/vtn_private.h | 3 +++ 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/compiler/spirv/spirv_info.h b/src/compiler/spirv/spirv_info.h index 121ffd2febb..a03c2ef8eb0 100644 --- a/src/compiler/spirv/spirv_info.h +++ b/src/compiler/spirv/spirv_info.h @@ -28,6 +28,7 @@ const char *spirv_capability_to_string(SpvCapability cap); const char *spirv_decoration_to_string(SpvDecoration dec); +const char *spirv_executionmode_to_string(SpvExecutionMode mode); const char *spirv_op_to_string(SpvOp op); #endif /* SPIRV_INFO_H */ diff --git a/src/compiler/spirv/spirv_info_c.py b/src/compiler/spirv/spirv_info_c.py index ff7942bcd3a..6880d3e329d 100644 --- a/src/compiler/spirv/spirv_info_c.py +++ b/src/compiler/spirv/spirv_info_c.py @@ -90,6 +90,7 @@ if __name__ == "__main__": info = [ collect_data(spirv_info, "Capability"), collect_data(spirv_info, "Decoration"), + collect_data(spirv_info, "ExecutionMode"), collect_opcodes(spirv_info), ] diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 19e4319bd24..5013a9c30ae 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -3865,9 +3865,16 @@ vtn_handle_execution_mode(struct vtn_builder *b, struct vtn_value *entry_point, break; case SpvExecutionModeVecTypeHint: - case SpvExecutionModeContractionOff: break; /* OpenCL */ + case SpvExecutionModeContractionOff: + if (b->shader->info.stage != MESA_SHADER_KERNEL) + vtn_warn("ExectionMode only allowed for CL-style kernels: %s", + spirv_executionmode_to_string(mode->exec_mode)); + else + b->exact = true; + break; + case SpvExecutionModeStencilRefReplacingEXT: vtn_assert(b->shader->info.stage == MESA_SHADER_FRAGMENT); break; diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index dc6fedc9129..f910630acfb 100644 --- a/src/compiler/spirv/vtn_alu.c +++ b/src/compiler/spirv/vtn_alu.c @@ -395,7 +395,7 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, if (glsl_type_is_matrix(vtn_src[0]->type) || (num_inputs >= 2 && glsl_type_is_matrix(vtn_src[1]->type))) { vtn_handle_matrix_alu(b, opcode, val, vtn_src[0], vtn_src[1]); - b->nb.exact = false; + b->nb.exact = b->exact; return; } @@ -661,5 +661,5 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, } /* default */ } - b->nb.exact = false; + b->nb.exact = b->exact; } diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c index 36dbb540463..c32d54e9006 100644 --- a/src/compiler/spirv/vtn_cfg.c +++ b/src/compiler/spirv/vtn_cfg.c @@ -287,6 +287,7 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode, b->func->impl = nir_function_impl_create(func); nir_builder_init(&b->nb, func->impl); b->nb.cursor = nir_before_cf_list(&b->func->impl->body); + b->nb.exact = b->exact; b->func_param_idx = 0; @@ -1038,6 +1039,7 @@ vtn_function_emit(struct vtn_builder *b, struct vtn_function *func, nir_builder_init(&b->nb, func->impl); b->func = func; b->nb.cursor = nir_after_cf_list(&func->impl->body); + b->nb.exact = b->exact; b->has_loop_continue = false; b->phi_table = _mesa_pointer_hash_table_create(b); diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index a2b3dee7517..3a5c5f32224 100644 --- a/src/compiler/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h @@ -604,6 +604,9 @@ struct vtn_builder { unsigned func_param_idx; bool has_loop_continue; + + /* false by default, set to true by the ContractionOff execution mode */ + bool exact; }; nir_ssa_def * -- 2.30.2