dcd073e
From a014573ad193775b2301e39275a1ca0ac3bb5847 Mon Sep 17 00:00:00 2001
dcd073e
From: Tom Stellard <thomas.stellard@amd.com>
dcd073e
Date: Tue, 13 Mar 2012 13:54:51 -0400
dcd073e
Subject: [PATCH 2/3] r600: Add some target builtins
dcd073e
dcd073e
---
dcd073e
 include/clang/Basic/BuiltinsR600.def |   32 ++++++++++++++++++++++++++++++++
dcd073e
 include/clang/Basic/TargetBuiltins.h |   10 ++++++++++
dcd073e
 lib/Basic/Targets.cpp                |   12 ++++++++++--
dcd073e
 3 files changed, 52 insertions(+), 2 deletions(-)
dcd073e
 create mode 100644 include/clang/Basic/BuiltinsR600.def
dcd073e
dcd073e
diff --git a/include/clang/Basic/BuiltinsR600.def b/include/clang/Basic/BuiltinsR600.def
dcd073e
new file mode 100644
dcd073e
index 0000000..ce1f30e
dcd073e
--- /dev/null
dcd073e
+++ b/include/clang/Basic/BuiltinsR600.def
dcd073e
@@ -0,0 +1,32 @@
dcd073e
+//===--- BuiltinsR600.def - R600 Builtin function database --  --*- C++ -*-===//
dcd073e
+//
dcd073e
+//                     The LLVM Compiler Infrastructure
dcd073e
+//
dcd073e
+// This file is distributed under the University of Illinois Open Source
dcd073e
+// License. See LICENSE.TXT for details.
dcd073e
+//
dcd073e
+//===----------------------------------------------------------------------===//
dcd073e
+//
dcd073e
+// This file defines the R600-specific builtin function database.  Users of
dcd073e
+// this file must define the BUILTIN macro to make use of this information.
dcd073e
+//
dcd073e
+//===----------------------------------------------------------------------===//
dcd073e
+//
dcd073e
+// Authors: Tom Stellard <thomas.stellard@amd.com>
dcd073e
+//
dcd073e
+
dcd073e
+// The format of this database matches clang/Basic/Builtins.def.
dcd073e
+
dcd073e
+BUILTIN(__builtin_r600_read_ngroups_x, "z", "nc")
dcd073e
+BUILTIN(__builtin_r600_read_ngroups_y, "z", "nc")
dcd073e
+BUILTIN(__builtin_r600_read_ngroups_z, "z", "nc")
dcd073e
+
dcd073e
+BUILTIN(__builtin_r600_read_tidig_x, "z", "nc")
dcd073e
+BUILTIN(__builtin_r600_read_tidig_y, "z", "nc")
dcd073e
+BUILTIN(__builtin_r600_read_tidig_z, "z", "nc")
dcd073e
+
dcd073e
+BUILTIN(__builtin_r600_read_tgid_x, "z", "nc")
dcd073e
+BUILTIN(__builtin_r600_read_tgid_y, "z", "nc")
dcd073e
+BUILTIN(__builtin_r600_read_tgid_z, "z", "nc")
dcd073e
+
dcd073e
+#undef BUILTIN
dcd073e
diff --git a/include/clang/Basic/TargetBuiltins.h b/include/clang/Basic/TargetBuiltins.h
dcd073e
index 7c04bf7..3460cd5 100644
dcd073e
--- a/include/clang/Basic/TargetBuiltins.h
dcd073e
+++ b/include/clang/Basic/TargetBuiltins.h
dcd073e
@@ -45,6 +45,16 @@ namespace clang {
dcd073e
     };
dcd073e
   }
dcd073e
 
dcd073e
+  /// R600 builtins
dcd073e
+  namespace R600 {
dcd073e
+    enum {
dcd073e
+        LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1,
dcd073e
+#define BUILTIN(ID, TYPE, ATTRS) BI##ID,
dcd073e
+#include "clang/Basic/BuiltinsR600.def"
dcd073e
+        LastTSBuiltin
dcd073e
+    };
dcd073e
+  }
dcd073e
+
dcd073e
 
dcd073e
   /// X86 builtins
dcd073e
   namespace X86 {
dcd073e
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
dcd073e
index 64dc01c..03f1a18 100644
dcd073e
--- a/lib/Basic/Targets.cpp
dcd073e
+++ b/lib/Basic/Targets.cpp
dcd073e
@@ -1070,6 +1070,7 @@ namespace {
dcd073e
 namespace {
dcd073e
 
dcd073e
 class AMDGPUTargetInfo : public TargetInfo {
dcd073e
+  static const Builtin::Info BuiltinInfo[];
dcd073e
 public:
dcd073e
 
dcd073e
   AMDGPUTargetInfo(const std::string& triple) : TargetInfo(triple) { }
dcd073e
@@ -1097,8 +1098,8 @@ public:
dcd073e
 
dcd073e
   virtual void getTargetBuiltins(const Builtin::Info *&Records,
dcd073e
                                  unsigned &NumRecords) const {
dcd073e
-    Records = NULL;
dcd073e
-    NumRecords = 0;
dcd073e
+    Records = BuiltinInfo;
dcd073e
+    NumRecords = clang::R600::LastTSBuiltin-Builtin::FirstTSBuiltin;
dcd073e
   }
dcd073e
 };
dcd073e
 
dcd073e
@@ -1132,6 +1133,13 @@ public:
dcd073e
   }
dcd073e
 };
dcd073e
 
dcd073e
+const Builtin::Info AMDGPUTargetInfo::BuiltinInfo[] = {
dcd073e
+#define BUILTIN(ID, TYPE, ATTRS) { #ID, TYPE, ATTRS, 0, ALL_LANGUAGES },
dcd073e
+#define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) { #ID, TYPE, ATTRS, HEADER,\
dcd073e
+                                              ALL_LANGUAGES },
dcd073e
+#include "clang/Basic/BuiltinsR600.def"
dcd073e
+};
dcd073e
+
dcd073e
 } // end anonymous namespace
dcd073e
 
dcd073e
 namespace {
dcd073e
-- 
dcd073e
1.7.7.6
dcd073e