Module: Mesa
Branch: master
Commit: 9779f34326a6d01f4b026202c72d77dc968fd174
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9779f34326a6d01f4b026202c72d77dc968fd174
Author: Marek Olšák <marek.ol...@amd.com>
Date: Sun Feb 25 00:39:44 2018 +0100
radeonsi: remove si_llvm_add_attribute
---
src/gallium/drivers/radeonsi/si_shader.c | 31 +++++++++++-----------
src/gallium/drivers/radeonsi/si_shader_internal.h | 2 --
.../drivers/radeonsi/si_shader_tgsi_setup.c | 8 ------
3 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_shader.c
b/src/gallium/drivers/radeonsi/si_shader.c
index d95e69f81a..343a5d57bf 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -4463,8 +4463,9 @@ static void si_create_function(struct si_shader_context
*ctx,
}
if (max_workgroup_size) {
- si_llvm_add_attribute(ctx->main_fn,
"amdgpu-max-work-group-size",
- max_workgroup_size);
+ ac_llvm_add_target_dep_function_attr(ctx->main_fn,
+
"amdgpu-max-work-group-size",
+ max_workgroup_size);
}
LLVMAddTargetDependentFunctionAttr(ctx->main_fn,
"no-signed-zeros-fp-math",
@@ -5006,17 +5007,17 @@ static void create_function(struct si_shader_context
*ctx)
/* Reserve register locations for VGPR inputs the PS prolog may need. */
if (ctx->type == PIPE_SHADER_FRAGMENT &&
ctx->separate_prolog) {
- si_llvm_add_attribute(ctx->main_fn,
- "InitialPSInputAddr",
- S_0286D0_PERSP_SAMPLE_ENA(1) |
- S_0286D0_PERSP_CENTER_ENA(1) |
- S_0286D0_PERSP_CENTROID_ENA(1) |
- S_0286D0_LINEAR_SAMPLE_ENA(1) |
- S_0286D0_LINEAR_CENTER_ENA(1) |
- S_0286D0_LINEAR_CENTROID_ENA(1) |
- S_0286D0_FRONT_FACE_ENA(1) |
- S_0286D0_ANCILLARY_ENA(1) |
- S_0286D0_POS_FIXED_PT_ENA(1));
+ ac_llvm_add_target_dep_function_attr(ctx->main_fn,
+ "InitialPSInputAddr",
+
S_0286D0_PERSP_SAMPLE_ENA(1) |
+
S_0286D0_PERSP_CENTER_ENA(1) |
+
S_0286D0_PERSP_CENTROID_ENA(1) |
+
S_0286D0_LINEAR_SAMPLE_ENA(1) |
+
S_0286D0_LINEAR_CENTER_ENA(1) |
+
S_0286D0_LINEAR_CENTROID_ENA(1) |
+ S_0286D0_FRONT_FACE_ENA(1)
|
+ S_0286D0_ANCILLARY_ENA(1) |
+
S_0286D0_POS_FIXED_PT_ENA(1));
}
shader->info.num_input_sgprs = 0;
@@ -7791,8 +7792,8 @@ static void si_build_ps_epilog_function(struct
si_shader_context *ctx,
/* Create the function. */
si_create_function(ctx, "ps_epilog", NULL, 0, &fninfo, 0);
/* Disable elimination of unused inputs. */
- si_llvm_add_attribute(ctx->main_fn,
- "InitialPSInputAddr", 0xffffff);
+ ac_llvm_add_target_dep_function_attr(ctx->main_fn,
+ "InitialPSInputAddr", 0xffffff);
/* Process colors. */
unsigned vgpr = fninfo.num_sgpr_params;
diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h
b/src/gallium/drivers/radeonsi/si_shader_internal.h
index dc73517018..157dd466b4 100644
--- a/src/gallium/drivers/radeonsi/si_shader_internal.h
+++ b/src/gallium/drivers/radeonsi/si_shader_internal.h
@@ -227,8 +227,6 @@ si_shader_context_from_abi(struct ac_shader_abi *abi)
return container_of(abi, ctx, abi);
}
-void si_llvm_add_attribute(LLVMValueRef F, const char *name, int value);
-
unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary,
LLVMTargetMachineRef tm,
struct pipe_debug_callback *debug);
diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
index 4a027d8659..f060ad68ed 100644
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
@@ -57,14 +57,6 @@ enum si_llvm_calling_convention {
RADEON_LLVM_AMDGPU_HS = 93,
};
-void si_llvm_add_attribute(LLVMValueRef F, const char *name, int value)
-{
- char str[16];
-
- snprintf(str, sizeof(str), "%i", value);
- LLVMAddTargetDependentFunctionAttr(F, name, str);
-}
-
struct si_llvm_diagnostics {
struct pipe_debug_callback *debug;
unsigned retval;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
