From 56684d453857c2511fd57fd73bb8cc98ec123a7a Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault@amd.com>
Date: Thu, 11 Aug 2016 17:31:42 +0000
Subject: [PATCH] AMDGPU: Fix crashes on memory functions

llvm-svn: 278369
---
 llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp |  3 +-
 llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h   |  7 ++++
 llvm/test/CodeGen/AMDGPU/mem-builtins.ll   | 54 ++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/CodeGen/AMDGPU/mem-builtins.ll

diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
index 5a38b46..44f59c3 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
@@ -116,7 +116,8 @@ AMDGPUSubtarget::AMDGPUSubtarget(const Triple &TT, StringRef GPU, StringRef FS,
     TexVTXClauseSize(0),
 
     FeatureDisable(false),
-    InstrItins(getInstrItineraryForCPU(GPU)) {
+    InstrItins(getInstrItineraryForCPU(GPU)),
+    TSInfo() {
   initializeSubtargetDependencies(TT, GPU, FS);
 }
 
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
index bab0d2b..b15d359 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
@@ -24,6 +24,7 @@
 #include "SIFrameLowering.h"
 #include "Utils/AMDGPUBaseInfo.h"
 #include "llvm/CodeGen/GlobalISel/GISelAccessor.h"
+#include "llvm/CodeGen/SelectionDAGTargetInfo.h"
 #include "llvm/Target/TargetSubtargetInfo.h"
 
 #define GET_SUBTARGETINFO_HEADER
@@ -108,6 +109,7 @@ protected:
   bool FeatureDisable;
 
   InstrItineraryData InstrItins;
+  SelectionDAGTargetInfo TSInfo;
 
 public:
   AMDGPUSubtarget(const Triple &TT, StringRef GPU, StringRef FS,
@@ -125,6 +127,11 @@ public:
     return &InstrItins;
   }
 
+  // Nothing implemented, just prevent crashes on use.
+  const SelectionDAGTargetInfo *getSelectionDAGInfo() const override {
+    return &TSInfo;
+  }
+
   void ParseSubtargetFeatures(StringRef CPU, StringRef FS);
 
   bool isAmdHsaOS() const {
diff --git a/llvm/test/CodeGen/AMDGPU/mem-builtins.ll b/llvm/test/CodeGen/AMDGPU/mem-builtins.ll
new file mode 100644
index 0000000..9751267
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/mem-builtins.ll
@@ -0,0 +1,54 @@
+; RUN: not llc -march=amdgcn -verify-machineinstrs < %s 2>&1 | FileCheck -check-prefix=ERROR %s
+
+declare i32 @memcmp(i8 addrspace(1)* readonly nocapture, i8 addrspace(1)* readonly nocapture, i64) #0
+declare i8 addrspace(1)* @memchr(i8 addrspace(1)* readonly nocapture, i32, i64) #1
+declare i8* @strcpy(i8* nocapture, i8* readonly nocapture) #0
+declare i32 @strlen(i8* nocapture) #1
+declare i32 @strnlen(i8* nocapture, i32) #1
+declare i32 @strcmp(i8* nocapture, i8* nocapture) #1
+
+
+; ERROR: error: <unknown>:0:0: in function test_memcmp void (i8 addrspace(1)*, i8 addrspace(1)*, i32*): unsupported call to function memcmp
+define void @test_memcmp(i8 addrspace(1)* %x, i8 addrspace(1)* %y, i32* nocapture %p) #0 {
+entry:
+  %cmp = tail call i32 @memcmp(i8 addrspace(1)* %x, i8 addrspace(1)* %y, i64 2)
+  store volatile i32 %cmp, i32 addrspace(1)* undef
+  ret void
+}
+
+; ERROR: error: <unknown>:0:0: in function test_memchr void (i8 addrspace(1)*, i32, i64): unsupported call to function memchr
+define void @test_memchr(i8 addrspace(1)* %src, i32 %char, i64 %len) #0 {
+  %res = call i8 addrspace(1)* @memchr(i8 addrspace(1)* %src, i32 %char, i64 %len)
+  store volatile i8 addrspace(1)* %res, i8 addrspace(1)* addrspace(1)* undef
+  ret void
+}
+
+; ERROR: error: <unknown>:0:0: in function test_strcpy void (i8*, i8*): unsupported call to function strcpy
+define void @test_strcpy(i8* %dst, i8* %src) #0 {
+  %res = call i8* @strcpy(i8* %dst, i8* %src)
+  store volatile i8* %res, i8* addrspace(1)* undef
+  ret void
+}
+
+; ERROR: error: <unknown>:0:0: in function test_strcmp void (i8*, i8*): unsupported call to function strcmp
+define void @test_strcmp(i8* %src0, i8* %src1) #0 {
+  %res = call i32 @strcmp(i8* %src0, i8* %src1)
+  store volatile i32 %res, i32 addrspace(1)* undef
+  ret void
+}
+
+; ERROR: error: <unknown>:0:0: in function test_strlen void (i8*): unsupported call to function strlen
+define void @test_strlen(i8* %src) #0 {
+  %res = call i32 @strlen(i8* %src)
+  store volatile i32 %res, i32 addrspace(1)* undef
+  ret void
+}
+
+; ERROR: error: <unknown>:0:0: in function test_strnlen void (i8*, i32): unsupported call to function strnlen
+define void @test_strnlen(i8* %src, i32 %size) #0 {
+  %res = call i32 @strnlen(i8* %src, i32 %size)
+  store volatile i32 %res, i32 addrspace(1)* undef
+  ret void
+}
+
+attributes #0 = { nounwind }
-- 
2.7.4