44227453ec
This is a squash of a few distinct changes:
glsl,spirv: Generate 1-bit Booleans
Revert "Use 32-bit opcodes in the NIR producers and optimizations"
Revert "nir/builder: Generate 32-bit bool opcodes transparently"
nir/builder: Generate 1-bit Booleans in nir_build_imm_bool
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
90 lines
3.0 KiB
Python
90 lines
3.0 KiB
Python
from __future__ import print_function
|
|
|
|
template = """\
|
|
/* Copyright (C) 2015 Broadcom
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _NIR_BUILDER_OPCODES_
|
|
#define _NIR_BUILDER_OPCODES_
|
|
|
|
<%
|
|
def src_decl_list(num_srcs):
|
|
return ', '.join('nir_ssa_def *src' + str(i) for i in range(num_srcs))
|
|
|
|
def src_list(num_srcs):
|
|
return ', '.join('src' + str(i) if i < num_srcs else 'NULL' for i in range(4))
|
|
%>
|
|
|
|
% for name, opcode in sorted(opcodes.items()):
|
|
static inline nir_ssa_def *
|
|
nir_${name}(nir_builder *build, ${src_decl_list(opcode.num_inputs)})
|
|
{
|
|
return nir_build_alu(build, nir_op_${name}, ${src_list(opcode.num_inputs)});
|
|
}
|
|
% endfor
|
|
|
|
/* Generic builder for system values. */
|
|
static inline nir_ssa_def *
|
|
nir_load_system_value(nir_builder *build, nir_intrinsic_op op, int index)
|
|
{
|
|
nir_intrinsic_instr *load = nir_intrinsic_instr_create(build->shader, op);
|
|
load->num_components = nir_intrinsic_infos[op].dest_components;
|
|
load->const_index[0] = index;
|
|
nir_ssa_dest_init(&load->instr, &load->dest,
|
|
nir_intrinsic_infos[op].dest_components, 32, NULL);
|
|
nir_builder_instr_insert(build, &load->instr);
|
|
return &load->dest.ssa;
|
|
}
|
|
|
|
<%
|
|
def sysval_decl_list(opcode):
|
|
res = ''
|
|
if opcode.indices:
|
|
res += ', unsigned ' + opcode.indices[0].lower()
|
|
return res
|
|
|
|
def sysval_arg_list(opcode):
|
|
args = []
|
|
if opcode.indices:
|
|
args.append(opcode.indices[0].lower())
|
|
else:
|
|
args.append('0')
|
|
return ', '.join(args)
|
|
%>
|
|
|
|
% for name, opcode in filter(lambda v: v[1].sysval, sorted(INTR_OPCODES.items())):
|
|
static inline nir_ssa_def *
|
|
nir_${name}(nir_builder *build${sysval_decl_list(opcode)})
|
|
{
|
|
return nir_load_system_value(build, nir_intrinsic_${name},
|
|
${sysval_arg_list(opcode)});
|
|
}
|
|
% endfor
|
|
|
|
#endif /* _NIR_BUILDER_OPCODES_ */"""
|
|
|
|
from nir_opcodes import opcodes
|
|
from nir_intrinsics import INTR_OPCODES
|
|
from mako.template import Template
|
|
|
|
print(Template(template).render(opcodes=opcodes, INTR_OPCODES=INTR_OPCODES))
|