diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2013-02-26 21:52:19 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-02-26 21:52:19 +0000 |
| commit | c2326f92b6f4301981ab6b5b41cce35a76439b3e (patch) | |
| tree | e190342ccb042930fc0c7e37ae0e45b86dca64ad | |
| parent | 296b82f8b17284655784a2f814609b082a3af4e0 (diff) | |
R600: Move intrinsic definitions into the R600 target directory9.1-abi-fix
There were only a few intrinsics defined in include/llvm and they
didn't have any corresponding clang __builtins, so there is no reason
to keep them there.
| -rw-r--r-- | include/llvm/Intrinsics.td | 1 | ||||
| -rw-r--r-- | include/llvm/IntrinsicsR600.td | 36 | ||||
| -rw-r--r-- | lib/Target/R600/R600Intrinsics.td | 23 |
3 files changed, 23 insertions, 37 deletions
diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td index 059bd804aa1..2e1597fe6f6 100644 --- a/include/llvm/Intrinsics.td +++ b/include/llvm/Intrinsics.td @@ -469,4 +469,3 @@ include "llvm/IntrinsicsXCore.td" include "llvm/IntrinsicsHexagon.td" include "llvm/IntrinsicsNVVM.td" include "llvm/IntrinsicsMips.td" -include "llvm/IntrinsicsR600.td" diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td deleted file mode 100644 index ecb5668d8e9..00000000000 --- a/include/llvm/IntrinsicsR600.td +++ /dev/null @@ -1,36 +0,0 @@ -//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file defines all of the R600-specific intrinsics. -// -//===----------------------------------------------------------------------===// - -let TargetPrefix = "r600" in { - -class R600ReadPreloadRegisterIntrinsic<string name> - : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>, - GCCBuiltin<name>; - -multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { - def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>; - def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>; - def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; -} - -defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_global_size">; -defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_local_size">; -defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_ngroups">; -defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_tgid">; -defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_tidig">; -} // End TargetPrefix = "r600" diff --git a/lib/Target/R600/R600Intrinsics.td b/lib/Target/R600/R600Intrinsics.td index 833372c878c..6046f0d7015 100644 --- a/lib/Target/R600/R600Intrinsics.td +++ b/lib/Target/R600/R600Intrinsics.td @@ -32,3 +32,26 @@ let TargetPrefix = "R600", isTarget = 1 in { def int_R600_store_dummy : Intrinsic<[], [llvm_i32_ty], []>; } +let TargetPrefix = "r600", isTarget = 1 in { + +class R600ReadPreloadRegisterIntrinsic<string name> + : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>, + GCCBuiltin<name>; + +multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { + def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>; + def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>; + def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; +} + +defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz < + "__builtin_r600_read_global_size">; +defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz < + "__builtin_r600_read_local_size">; +defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < + "__builtin_r600_read_ngroups">; +defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < + "__builtin_r600_read_tgid">; +defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz < + "__builtin_r600_read_tidig">; +} |