Mesa (master): r600: cleanup llvm ir target selection.

Dave Airlie airlied at kemper.freedesktop.org
Tue Oct 10 21:40:17 UTC 2017


Module: Mesa
Branch: master
Commit: 96e85709df632674b9976435d350ce5d21ad8aea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=96e85709df632674b9976435d350ce5d21ad8aea

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 10 06:27:40 2017 +1000

r600: cleanup llvm ir target selection.

Only r600 target used now for compute IR.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/r600/r600_pipe_common.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index 066d10a451..acad670d6f 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -1012,24 +1012,8 @@ static int r600_get_compute_param(struct pipe_screen *screen,
 	switch (param) {
 	case PIPE_COMPUTE_CAP_IR_TARGET: {
 		const char *gpu;
-		const char *triple;
-		if (rscreen->family <= CHIP_ARUBA) {
-			triple = "r600--";
-		} else {
-			if (HAVE_LLVM < 0x0400) {
-				triple = "amdgcn--";
-			} else {
-				triple = "amdgcn-mesa-mesa3d";
-			}
-		}
-		switch(rscreen->family) {
-		/* Clang < 3.6 is missing Hainan in its list of
-		 * GPUs, so we need to use the name of a similar GPU.
-		 */
-		default:
-			gpu = r600_get_llvm_processor_name(rscreen->family);
-			break;
-		}
+		const char *triple = "r600--";
+		gpu = r600_get_llvm_processor_name(rscreen->family);
 		if (ret) {
 			sprintf(ret, "%s-%s", gpu, triple);
 		}




More information about the mesa-commit mailing list