Mesa (9.2): radeonsi: Use 'SI' as the LLVM processor for CIK on LLVM <= 3.3
Carl Worth
cworth at kemper.freedesktop.org
Wed Oct 16 22:35:50 UTC 2013
Module: Mesa
Branch: 9.2
Commit: bf9be81b47270dd7ee42b5fe7e8fcf37a7238bee
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf9be81b47270dd7ee42b5fe7e8fcf37a7238bee
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Thu Oct 3 07:56:35 2013 -0700
radeonsi: Use 'SI' as the LLVM processor for CIK on LLVM <= 3.3
LLVM 3.3 does not know about CIK processors, and the codes paths for SI
and CIK are the same.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Cc: "9.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 9da4021626dd48a1cc25054d1d4009e098f4d97b)
---
src/gallium/drivers/radeonsi/radeonsi_pipe.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 69b9ca9..46a2022 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -298,11 +298,15 @@ const char *r600_get_llvm_processor_name(enum radeon_family family)
case CHIP_PITCAIRN: return "pitcairn";
case CHIP_VERDE: return "verde";
case CHIP_OLAND: return "oland";
+#if HAVE_LLVM <= 0x0303
+ default: return "SI";
+#else
case CHIP_HAINAN: return "hainan";
case CHIP_BONAIRE: return "bonaire";
case CHIP_KABINI: return "kabini";
case CHIP_KAVERI: return "kaveri";
default: return "";
+#endif
}
}
More information about the mesa-commit
mailing list