fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: remove llvm_type_is_64bit

Browse source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3399>
This commit is contained in:
Marek Olšák 2020-01-14 19:29:34 -05:00 • committed by Marge Bot
parent 194449a405
commit 57bd73e229
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -473,7 +473,7 @@ static LLVMValueRef si_llvm_load_input_gs(struct ac_shader_abi *abi,
LLVMValueRef ptr = ac_build_gep0(&ctx->ac, ctx->esgs_ring, vtx_offset); LLVMValueRef ptr = ac_build_gep0(&ctx->ac, ctx->esgs_ring, vtx_offset);
LLVMValueRef value = LLVMBuildLoad(ctx->ac.builder, ptr, ""); LLVMValueRef value = LLVMBuildLoad(ctx->ac.builder, ptr, "");
if (llvm_type_is_64bit(ctx, type)) { if (ac_get_type_size(type) == 64) {
ptr = LLVMBuildGEP(ctx->ac.builder, ptr, ptr = LLVMBuildGEP(ctx->ac.builder, ptr,
&ctx->ac.i32_1, 1, ""); &ctx->ac.i32_1, 1, "");
LLVMValueRef values[2] = { LLVMValueRef values[2] = {
@ -507,7 +507,7 @@ static LLVMValueRef si_llvm_load_input_gs(struct ac_shader_abi *abi,
value = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, ctx->i32_0, value = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, ctx->i32_0,
vtx_offset, soffset, 0, ac_glc, true, false); vtx_offset, soffset, 0, ac_glc, true, false);
if (llvm_type_is_64bit(ctx, type)) { if (ac_get_type_size(type) == 64) {
LLVMValueRef value2; LLVMValueRef value2;
soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0); soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0);
@ -533,7 +533,7 @@ static LLVMValueRef si_nir_load_input_gs(struct ac_shader_abi *abi,
LLVMValueRef value[4]; LLVMValueRef value[4];
for (unsigned i = 0; i < num_components; i++) { for (unsigned i = 0; i < num_components; i++) {
unsigned offset = i; unsigned offset = i;
if (llvm_type_is_64bit(ctx, type)) if (ac_get_type_size(type) == 64)
offset *= 2; offset *= 2;
offset += component; offset += component;

10
src/gallium/drivers/radeonsi/si_shader_internal.h
View file

@ -333,14 +333,4 @@ void si_llvm_build_monolithic_ps(struct si_shader_context *ctx,
struct si_shader *shader); struct si_shader *shader);
void si_llvm_init_ps_callbacks(struct si_shader_context *ctx); void si_llvm_init_ps_callbacks(struct si_shader_context *ctx);
/* TODO: remove */
static inline bool llvm_type_is_64bit(struct si_shader_context *ctx,
LLVMTypeRef type)
{
if (type == ctx->ac.i64 || type == ctx->ac.f64)
return true;
return false;
}
#endif #endif

8
src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
View file

@ -304,7 +304,7 @@ static LLVMValueRef buffer_load(struct si_shader_context *ctx,
return LLVMBuildBitCast(ctx->ac.builder, value, vec_type, ""); return LLVMBuildBitCast(ctx->ac.builder, value, vec_type, "");
} }
if (!llvm_type_is_64bit(ctx, type)) { if (ac_get_type_size(type) != 64) {
value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset, value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset,
0, ac_glc, can_speculate, false); 0, ac_glc, can_speculate, false);
@ -345,7 +345,7 @@ static LLVMValueRef lshs_lds_load(struct si_shader_context *ctx,
} }
/* Split 64-bit loads. */ /* Split 64-bit loads. */
if (llvm_type_is_64bit(ctx, type)) { if (ac_get_type_size(type) == 64) {
LLVMValueRef lo, hi; LLVMValueRef lo, hi;
lo = lshs_lds_load(ctx, ctx->i32, swizzle, dw_addr); lo = lshs_lds_load(ctx, ctx->i32, swizzle, dw_addr);
@ -489,7 +489,7 @@ static LLVMValueRef si_nir_load_tcs_varyings(struct ac_shader_abi *abi,
LLVMValueRef value[4]; LLVMValueRef value[4];
for (unsigned i = 0; i < num_components; i++) { for (unsigned i = 0; i < num_components; i++) {
unsigned offset = i; unsigned offset = i;
if (llvm_type_is_64bit(ctx, type)) if (ac_get_type_size(type) == 64)
offset *= 2; offset *= 2;
offset += component; offset += component;
@ -541,7 +541,7 @@ LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
LLVMValueRef value[4]; LLVMValueRef value[4];
for (unsigned i = 0; i < num_components; i++) { for (unsigned i = 0; i < num_components; i++) {
unsigned offset = i; unsigned offset = i;
if (llvm_type_is_64bit(ctx, type)) { if (ac_get_type_size(type) == 64) {
offset *= 2; offset *= 2;
if (offset == 4) { if (offset == 4) {
ubyte name = info->input_semantic_name[driver_location + 1]; ubyte name = info->input_semantic_name[driver_location + 1];