diff --git a/include/llvm/IR/Intrinsics.td b/include/llvm/IR/Intrinsics.td index 152c7fcfcca..e6f6d0ffe8b 100644 --- a/include/llvm/IR/Intrinsics.td +++ b/include/llvm/IR/Intrinsics.td @@ -635,6 +635,6 @@ include "llvm/IR/IntrinsicsXCore.td" include "llvm/IR/IntrinsicsHexagon.td" include "llvm/IR/IntrinsicsNVVM.td" include "llvm/IR/IntrinsicsMips.td" -include "llvm/IR/IntrinsicsR600.td" +include "llvm/IR/IntrinsicsAMDGPU.td" include "llvm/IR/IntrinsicsBPF.td" include "llvm/IR/IntrinsicsSystemZ.td" diff --git a/include/llvm/IR/IntrinsicsR600.td b/include/llvm/IR/IntrinsicsAMDGPU.td similarity index 100% rename from include/llvm/IR/IntrinsicsR600.td rename to include/llvm/IR/IntrinsicsAMDGPU.td diff --git a/test/Transforms/CodeGenPrepare/AMDGPU/lit.local.cfg b/test/Transforms/CodeGenPrepare/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..6baccf05fff --- /dev/null +++ b/test/Transforms/CodeGenPrepare/AMDGPU/lit.local.cfg @@ -0,0 +1,3 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True + diff --git a/test/Transforms/CodeGenPrepare/R600/no-sink-addrspacecast.ll b/test/Transforms/CodeGenPrepare/AMDGPU/no-sink-addrspacecast.ll similarity index 100% rename from test/Transforms/CodeGenPrepare/R600/no-sink-addrspacecast.ll rename to test/Transforms/CodeGenPrepare/AMDGPU/no-sink-addrspacecast.ll diff --git a/test/Transforms/CodeGenPrepare/R600/lit.local.cfg b/test/Transforms/CodeGenPrepare/R600/lit.local.cfg deleted file mode 100644 index 4086e8d681c..00000000000 --- a/test/Transforms/CodeGenPrepare/R600/lit.local.cfg +++ /dev/null @@ -1,3 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True - diff --git a/test/Transforms/LoopIdiom/AMDGPU/lit.local.cfg b/test/Transforms/LoopIdiom/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..6baccf05fff --- /dev/null +++ b/test/Transforms/LoopIdiom/AMDGPU/lit.local.cfg @@ -0,0 +1,3 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True + diff --git a/test/Transforms/LoopIdiom/R600/popcnt.ll b/test/Transforms/LoopIdiom/AMDGPU/popcnt.ll similarity index 100% rename from test/Transforms/LoopIdiom/R600/popcnt.ll rename to test/Transforms/LoopIdiom/AMDGPU/popcnt.ll diff --git a/test/Transforms/LoopIdiom/R600/lit.local.cfg b/test/Transforms/LoopIdiom/R600/lit.local.cfg deleted file mode 100644 index 4086e8d681c..00000000000 --- a/test/Transforms/LoopIdiom/R600/lit.local.cfg +++ /dev/null @@ -1,3 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True - diff --git a/test/Transforms/SLPVectorizer/AMDGPU/lit.local.cfg b/test/Transforms/SLPVectorizer/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..6baccf05fff --- /dev/null +++ b/test/Transforms/SLPVectorizer/AMDGPU/lit.local.cfg @@ -0,0 +1,3 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True + diff --git a/test/Transforms/SLPVectorizer/R600/simplebb.ll b/test/Transforms/SLPVectorizer/AMDGPU/simplebb.ll similarity index 100% rename from test/Transforms/SLPVectorizer/R600/simplebb.ll rename to test/Transforms/SLPVectorizer/AMDGPU/simplebb.ll diff --git a/test/Transforms/SLPVectorizer/R600/lit.local.cfg b/test/Transforms/SLPVectorizer/R600/lit.local.cfg deleted file mode 100644 index 4086e8d681c..00000000000 --- a/test/Transforms/SLPVectorizer/R600/lit.local.cfg +++ /dev/null @@ -1,3 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True - diff --git a/test/Transforms/SeparateConstOffsetFromGEP/AMDGPU/lit.local.cfg b/test/Transforms/SeparateConstOffsetFromGEP/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..6baccf05fff --- /dev/null +++ b/test/Transforms/SeparateConstOffsetFromGEP/AMDGPU/lit.local.cfg @@ -0,0 +1,3 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True + diff --git a/test/Transforms/SeparateConstOffsetFromGEP/R600/split-gep-and-gvn-addrspace-addressing-modes.ll b/test/Transforms/SeparateConstOffsetFromGEP/AMDGPU/split-gep-and-gvn-addrspace-addressing-modes.ll similarity index 100% rename from test/Transforms/SeparateConstOffsetFromGEP/R600/split-gep-and-gvn-addrspace-addressing-modes.ll rename to test/Transforms/SeparateConstOffsetFromGEP/AMDGPU/split-gep-and-gvn-addrspace-addressing-modes.ll diff --git a/test/Transforms/SeparateConstOffsetFromGEP/R600/lit.local.cfg b/test/Transforms/SeparateConstOffsetFromGEP/R600/lit.local.cfg deleted file mode 100644 index 4086e8d681c..00000000000 --- a/test/Transforms/SeparateConstOffsetFromGEP/R600/lit.local.cfg +++ /dev/null @@ -1,3 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True - diff --git a/test/Transforms/SimplifyCFG/R600/cttz-ctlz.ll b/test/Transforms/SimplifyCFG/AMDGPU/cttz-ctlz.ll similarity index 100% rename from test/Transforms/SimplifyCFG/R600/cttz-ctlz.ll rename to test/Transforms/SimplifyCFG/AMDGPU/cttz-ctlz.ll diff --git a/test/Transforms/SimplifyCFG/AMDGPU/lit.local.cfg b/test/Transforms/SimplifyCFG/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..2a665f06be7 --- /dev/null +++ b/test/Transforms/SimplifyCFG/AMDGPU/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True diff --git a/test/Transforms/SimplifyCFG/R600/lit.local.cfg b/test/Transforms/SimplifyCFG/R600/lit.local.cfg deleted file mode 100644 index ad9ce2541ef..00000000000 --- a/test/Transforms/SimplifyCFG/R600/lit.local.cfg +++ /dev/null @@ -1,2 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True diff --git a/test/Transforms/StraightLineStrengthReduce/AMDGPU/lit.local.cfg b/test/Transforms/StraightLineStrengthReduce/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..2a665f06be7 --- /dev/null +++ b/test/Transforms/StraightLineStrengthReduce/AMDGPU/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True diff --git a/test/Transforms/StraightLineStrengthReduce/R600/reassociate-geps-and-slsr-addrspace.ll b/test/Transforms/StraightLineStrengthReduce/AMDGPU/reassociate-geps-and-slsr-addrspace.ll similarity index 100% rename from test/Transforms/StraightLineStrengthReduce/R600/reassociate-geps-and-slsr-addrspace.ll rename to test/Transforms/StraightLineStrengthReduce/AMDGPU/reassociate-geps-and-slsr-addrspace.ll diff --git a/test/Transforms/StraightLineStrengthReduce/R600/lit.local.cfg b/test/Transforms/StraightLineStrengthReduce/R600/lit.local.cfg deleted file mode 100644 index ad9ce2541ef..00000000000 --- a/test/Transforms/StraightLineStrengthReduce/R600/lit.local.cfg +++ /dev/null @@ -1,2 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True