From: Jason Ekstrand Date: Wed, 15 Feb 2017 06:20:32 +0000 (-0800) Subject: nir: Rename lower_double_pack to lower_64bit_pack X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e10f522cd7dd1c1a9abf79ad62b7be8486a6b9b8;p=mesa.git nir: Rename lower_double_pack to lower_64bit_pack There's nothing "double" about it other than, perhaps, the fact that it packs two 32-bit values. Reviewed-by: Kenneth Graunke --- diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 1e8edc08743..643a0181d8c 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -205,6 +205,7 @@ NIR_FILES = \ nir/nir_liveness.c \ nir/nir_loop_analyze.c \ nir/nir_loop_analyze.h \ + nir/nir_lower_64bit_packing.c \ nir/nir_lower_alu_to_scalar.c \ nir/nir_lower_atomics.c \ nir/nir_lower_bitmap.c \ @@ -213,7 +214,6 @@ NIR_FILES = \ nir/nir_lower_clip_cull_distance_arrays.c \ nir/nir_lower_constant_initializers.c \ nir/nir_lower_double_ops.c \ - nir/nir_lower_double_packing.c \ nir/nir_lower_drawpixels.c \ nir/nir_lower_global_vars_to_local.c \ nir/nir_lower_gs_intrinsics.c \ diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index d92e6eb1109..84451a17aad 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2549,7 +2549,7 @@ typedef enum { } nir_lower_doubles_options; void nir_lower_doubles(nir_shader *shader, nir_lower_doubles_options options); -void nir_lower_double_pack(nir_shader *shader); +void nir_lower_64bit_pack(nir_shader *shader); bool nir_normalize_cubemap_coords(nir_shader *shader); diff --git a/src/compiler/nir/nir_lower_64bit_packing.c b/src/compiler/nir/nir_lower_64bit_packing.c new file mode 100644 index 00000000000..f523cebf474 --- /dev/null +++ b/src/compiler/nir/nir_lower_64bit_packing.c @@ -0,0 +1,97 @@ +/* + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include "nir.h" +#include "nir_builder.h" + +/* + * lowers: + * + * packDouble2x32(foo) -> packDouble2x32Split(foo.x, foo.y) + * unpackDouble2x32(foo) -> vec2(unpackDouble2x32_x(foo), unpackDouble2x32_y(foo)) + * packInt2x32(foo) -> packInt2x32Split(foo.x, foo.y) + * unpackInt2x32(foo) -> vec2(unpackInt2x32_x(foo), unpackInt2x32_y(foo)) + */ + +static nir_ssa_def * +lower_pack_64(nir_builder *b, nir_ssa_def *src) +{ + return nir_pack_64_2x32_split(b, nir_channel(b, src, 0), + nir_channel(b, src, 1)); +} + +static nir_ssa_def * +lower_unpack_64(nir_builder *b, nir_ssa_def *src) +{ + return nir_vec2(b, nir_unpack_64_2x32_split_x(b, src), + nir_unpack_64_2x32_split_y(b, src)); +} + +static void +lower_64bit_pack_impl(nir_function_impl *impl) +{ + nir_builder b; + nir_builder_init(&b, impl); + + nir_foreach_block(block, impl) { + nir_foreach_instr_safe(instr, block) { + if (instr->type != nir_instr_type_alu) + continue; + + nir_alu_instr *alu_instr = (nir_alu_instr *) instr; + + if (alu_instr->op != nir_op_pack_64_2x32 && + alu_instr->op != nir_op_unpack_64_2x32) + continue; + + b.cursor = nir_before_instr(&alu_instr->instr); + + nir_ssa_def *src = nir_ssa_for_alu_src(&b, alu_instr, 0); + nir_ssa_def *dest; + + switch (alu_instr->op) { + case nir_op_pack_64_2x32: + dest = lower_pack_64(&b, src); + break; + case nir_op_unpack_64_2x32: + dest = lower_unpack_64(&b, src); + break; + default: + unreachable("Impossible opcode"); + } + + nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, nir_src_for_ssa(dest)); + nir_instr_remove(&alu_instr->instr); + } + } +} + +void +nir_lower_64bit_pack(nir_shader *shader) +{ + nir_foreach_function(function, shader) { + if (function->impl) + lower_64bit_pack_impl(function->impl); + } +} diff --git a/src/compiler/nir/nir_lower_double_packing.c b/src/compiler/nir/nir_lower_double_packing.c deleted file mode 100644 index 61c4ea65eae..00000000000 --- a/src/compiler/nir/nir_lower_double_packing.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright © 2015 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#include "nir.h" -#include "nir_builder.h" - -/* - * lowers: - * - * packDouble2x32(foo) -> packDouble2x32Split(foo.x, foo.y) - * unpackDouble2x32(foo) -> vec2(unpackDouble2x32_x(foo), unpackDouble2x32_y(foo)) - * packInt2x32(foo) -> packInt2x32Split(foo.x, foo.y) - * unpackInt2x32(foo) -> vec2(unpackInt2x32_x(foo), unpackInt2x32_y(foo)) - */ - -static nir_ssa_def * -lower_pack_64(nir_builder *b, nir_ssa_def *src) -{ - return nir_pack_64_2x32_split(b, nir_channel(b, src, 0), - nir_channel(b, src, 1)); -} - -static nir_ssa_def * -lower_unpack_64(nir_builder *b, nir_ssa_def *src) -{ - return nir_vec2(b, nir_unpack_64_2x32_split_x(b, src), - nir_unpack_64_2x32_split_y(b, src)); -} - -static void -lower_double_pack_impl(nir_function_impl *impl) -{ - nir_builder b; - nir_builder_init(&b, impl); - - nir_foreach_block(block, impl) { - nir_foreach_instr_safe(instr, block) { - if (instr->type != nir_instr_type_alu) - continue; - - nir_alu_instr *alu_instr = (nir_alu_instr *) instr; - - if (alu_instr->op != nir_op_pack_64_2x32 && - alu_instr->op != nir_op_unpack_64_2x32) - continue; - - b.cursor = nir_before_instr(&alu_instr->instr); - - nir_ssa_def *src = nir_ssa_for_alu_src(&b, alu_instr, 0); - nir_ssa_def *dest; - - switch (alu_instr->op) { - case nir_op_pack_64_2x32: - dest = lower_pack_64(&b, src); - break; - case nir_op_unpack_64_2x32: - dest = lower_unpack_64(&b, src); - break; - default: - unreachable("Impossible opcode"); - } - - nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, nir_src_for_ssa(dest)); - nir_instr_remove(&alu_instr->instr); - } - } -} - -void -nir_lower_double_pack(nir_shader *shader) -{ - nir_foreach_function(function, shader) { - if (function->impl) - lower_double_pack_impl(function->impl); - } -} - diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 0a8d3a838b6..74703490c91 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -511,7 +511,7 @@ nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, nir_lower_dfract | nir_lower_dround_even | nir_lower_dmod); - OPT_V(nir_lower_double_pack); + OPT_V(nir_lower_64bit_pack); } while (progress); return nir;