diff --git a/llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp
index 515cc07dd449..31ae706d91d5 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUCallLowering.cpp
@@ -144,18 +144,38 @@ bool AMDGPUCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
   Function::const_arg_iterator CurOrigArg = F.arg_begin();
   const AMDGPUTargetLowering &TLI = *getTLI<AMDGPUTargetLowering>();
   for (unsigned i = 0; i != NumArgs; ++i, ++CurOrigArg) {
-    MVT ValVT = TLI.getValueType(DL, CurOrigArg->getType()).getSimpleVT();
+    EVT ValEVT = TLI.getValueType(DL, CurOrigArg->getType());
+
+    // We can only hanlde simple value types at the moment.
+    if (!ValEVT.isSimple())
+      return false;
+    MVT ValVT = ValEVT.getSimpleVT();
     ISD::ArgFlagsTy Flags;
+    ArgInfo OrigArg{VRegs[i], CurOrigArg->getType()};
+    setArgFlags(OrigArg, i + 1, DL, F);
     Flags.setOrigAlign(DL.getABITypeAlignment(CurOrigArg->getType()));
     CCAssignFn *AssignFn = CCAssignFnForCall(F.getCallingConv(),
                                              /*IsVarArg=*/false);
     bool Res =
-        AssignFn(i, ValVT, ValVT, CCValAssign::Full, Flags, CCInfo);
-    assert(!Res && "Call operand has unhandled type");
-    (void)Res;
+        AssignFn(i, ValVT, ValVT, CCValAssign::Full, OrigArg.Flags, CCInfo);
+
+    // Fail if we don't know how to handle this type.
+    if (Res)
+      return false;
   }
 
   Function::const_arg_iterator Arg = F.arg_begin();
+
+  if (F.getCallingConv() == CallingConv::AMDGPU_VS) {
+    for (unsigned i = 0; i != NumArgs; ++i, ++Arg) {
+      CCValAssign &VA = ArgLocs[i];
+      MRI.addLiveIn(VA.getLocReg(), VRegs[i]);
+      MIRBuilder.getMBB().addLiveIn(VA.getLocReg());
+      MIRBuilder.buildCopy(VRegs[i], VA.getLocReg());
+    }
+    return true;
+  }
+
   for (unsigned i = 0; i != NumArgs; ++i, ++Arg) {
     // FIXME: We should be getting DebugInfo from the arguments some how.
     CCValAssign &VA = ArgLocs[i];
diff --git a/llvm/test/CodeGen/AMDGPU/GlobalISel/irtranslator-amdgpu_vs.ll b/llvm/test/CodeGen/AMDGPU/GlobalISel/irtranslator-amdgpu_vs.ll
new file mode 100644
index 000000000000..6c3563a9c333
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/GlobalISel/irtranslator-amdgpu_vs.ll
@@ -0,0 +1,60 @@
+; RUN: llc -mtriple=amdgcn-mesa-mesa3d -mcpu=fiji -stop-after=irtranslator -global-isel %s -o - | FileCheck %s
+
+
+; CHECK-LABEL: name: test_f32_inreg
+; CHECK: [[S0:%[0-9]+]](s32) = COPY %sgpr0
+; CHECK: G_INTRINSIC_W_SIDE_EFFECTS intrinsic(@llvm.amdgcn.exp), %{{[0-9]+}}(s32), %{{[0-9]+}}(s32), [[S0]]
+define amdgpu_vs void @test_f32_inreg(float inreg %arg0) {
+  call void @llvm.amdgcn.exp.f32(i32 32, i32 15, float %arg0, float undef, float undef, float undef, i1 false, i1 false) #0
+  ret void
+}
+
+; CHECK-LABEL: name: test_f32
+; CHECK: [[V0:%[0-9]+]](s32) = COPY %vgpr0
+; CHECK: G_INTRINSIC_W_SIDE_EFFECTS intrinsic(@llvm.amdgcn.exp), %{{[0-9]+}}(s32), %{{[0-9]+}}(s32), [[V0]]
+define amdgpu_vs void @test_f32(float %arg0) {
+  call void @llvm.amdgcn.exp.f32(i32 32, i32 15, float %arg0, float undef, float undef, float undef, i1 false, i1 false) #0
+  ret void
+}
+
+; CHECK-LABEL: name: test_ptr2_byval
+; CHECK: [[S01:%[0-9]+]](p2) = COPY %sgpr0_sgpr1
+; CHECK: G_LOAD [[S01]]
+define amdgpu_vs void @test_ptr2_byval(i32 addrspace(2)* byval %arg0) {
+   %tmp0 = load volatile i32, i32 addrspace(2)* %arg0
+  ret void
+}
+
+; CHECK-LABEL: name: test_ptr2_inreg
+; CHECK: [[S01:%[0-9]+]](p2) = COPY %sgpr0_sgpr1
+; CHECK: G_LOAD [[S01]]
+define amdgpu_vs void @test_ptr2_inreg(i32 addrspace(2)* inreg %arg0) {
+  %tmp0 = load volatile i32, i32 addrspace(2)* %arg0
+  ret void
+}
+
+; CHECK-LABEL: name: test_sgpr_alignment0
+; CHECK: [[S0:%[0-9]+]](s32) = COPY %sgpr0
+; CHECK: [[S23:%[0-9]+]](p2) = COPY %sgpr2_sgpr3
+; CHECK: G_LOAD [[S23]]
+; CHECK: G_INTRINSIC_W_SIDE_EFFECTS intrinsic(@llvm.amdgcn.exp), %{{[0-9]+}}(s32), %{{[0-9]+}}(s32), [[S0]]
+define amdgpu_vs void @test_sgpr_alignment0(float inreg %arg0, i32 addrspace(2)* inreg %arg1) {
+  %tmp0 = load volatile i32, i32 addrspace(2)* %arg1
+  call void @llvm.amdgcn.exp.f32(i32 32, i32 15, float %arg0, float undef, float undef, float undef, i1 false, i1 false) #0
+  ret void
+}
+
+; CHECK-LABEL: name: test_order
+; CHECK: [[S0:%[0-9]+\(s32\)]] = COPY %sgpr0
+; CHECK: [[S1:%[0-9]+\(s32\)]] = COPY %sgpr1
+; CHECK: [[V0:%[0-9]+\(s32\)]] = COPY %vgpr0
+; CHECK: [[V1:%[0-9]+\(s32\)]] = COPY %vgpr1
+; CHECK: G_INTRINSIC_W_SIDE_EFFECTS intrinsic(@llvm.amdgcn.exp), %{{[0-9]+}}(s32), %{{[0-9]+}}(s32), [[V0]], [[S0]], [[V1]], [[S1]]
+define amdgpu_vs void @test_order(float inreg %arg0, float inreg %arg1, float %arg2, float %arg3) {
+  call void @llvm.amdgcn.exp.f32(i32 32, i32 15, float %arg2, float %arg0, float %arg3, float %arg1, i1 false, i1 false) #0
+  ret void
+}
+
+declare void @llvm.amdgcn.exp.f32(i32, i32, float, float, float, float, i1, i1)  #0
+
+attributes #0 = { nounwind }