Commit e5220104 authored by Thomas Lively's avatar Thomas Lively
Browse files

[WebAssembly] Custom combines for f64x2.promote_low_f32x4 

Replace the clang builtin function and LLVM intrinsic previously used to select
the f64x2.promote_low_f32x4 instruction with custom combines from standard
SelectionDAG nodes. Implement the new combines to share code with the similar
combines for f64x2.convert_low_i32x4_{s,u}. Resolves PR50232.

Differential Revision: https://reviews.llvm.org/D105675
parent 04c203e3

clang/include/clang/Basic/BuiltinsWebAssembly.def

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ TARGET_BUILTIN(__builtin_wasm_narrow_u_i16x8_i32x4, "V8UsV4iV4i", "nc", "simd128 
TARGET_BUILTIN(__builtin_wasm_trunc_sat_zero_s_f64x2_i32x4, "V4iV2d", "nc", "simd128")

TARGET_BUILTIN(__builtin_wasm_trunc_sat_zero_u_f64x2_i32x4, "V4UiV2d", "nc", "simd128")

TARGET_BUILTIN(__builtin_wasm_demote_zero_f64x2_f32x4, "V4fV2d", "nc", "simd128")

TARGET_BUILTIN(__builtin_wasm_promote_low_f32x4_f64x2, "V2dV4f", "nc", "simd128")



TARGET_BUILTIN(__builtin_wasm_load32_zero, "V4iiC*", "n", "simd128")

TARGET_BUILTIN(__builtin_wasm_load64_zero, "V2LLiLLiC*", "n", "simd128")

clang/lib/CodeGen/CGBuiltin.cpp

+0 −5
Original line number Diff line number Diff line
@@ -17728,11 +17728,6 @@ Value *CodeGenFunction::EmitWebAssemblyBuiltinExpr(unsigned BuiltinID, 
    Function *Callee = CGM.getIntrinsic(Intrinsic::wasm_demote_zero);

    return Builder.CreateCall(Callee, Vec);

  }

  case WebAssembly::BI__builtin_wasm_promote_low_f32x4_f64x2: {

    Value *Vec = EmitScalarExpr(E->getArg(0));

    Function *Callee = CGM.getIntrinsic(Intrinsic::wasm_promote_low);

    return Builder.CreateCall(Callee, Vec);

  }

  case WebAssembly::BI__builtin_wasm_load32_zero: {

    Value *Ptr = EmitScalarExpr(E->getArg(0));

    Function *Callee = CGM.getIntrinsic(Intrinsic::wasm_load32_zero);

clang/lib/Headers/wasm_simd128.h

+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ typedef unsigned short __u16x4 
typedef int __i32x2 __attribute__((__vector_size__(8), __aligned__(8)));

typedef unsigned int __u32x2

    __attribute__((__vector_size__(8), __aligned__(8)));

typedef float __f32x2 __attribute__((__vector_size__(8), __aligned__(8)));



#define __DEFAULT_FN_ATTRS                                                     \

  __attribute__((__always_inline__, __nodebug__, __target__("simd128"),        \
@@ -1155,7 +1156,8 @@ wasm_f32x4_demote_f64x2_zero(v128_t __a) { 


static __inline__ v128_t __DEFAULT_FN_ATTRS

wasm_f64x2_promote_low_f32x4(v128_t __a) {

  return (v128_t)__builtin_wasm_promote_low_f32x4_f64x2((__f32x4)__a);

  return (v128_t) __builtin_convertvector(

      (__f32x2){((__f32x4)__a)[0], ((__f32x4)__a)[1]}, __f64x2);

}



#define wasm_i8x16_shuffle(__a, __b, __c0, __c1, __c2, __c3, __c4, __c5, __c6, \

clang/test/CodeGen/builtins-wasm.c

+0 −6
Original line number Diff line number Diff line
@@ -898,12 +898,6 @@ f32x4 wasm_demote_zero_f64x2_f32x4(f64x2 x) { 
  // WEBASSEMBLY: ret

}



f64x2 wasm_promote_low_f32x4_f64x2(f32x4 x) {

  return __builtin_wasm_promote_low_f32x4_f64x2(x);

  // WEBASSEMBLY: call <2 x double> @llvm.wasm.promote.low(<4 x float> %x)

  // WEBASSEMBLY: ret

}



i32x4 load32_zero(const int *p) {

  return __builtin_wasm_load32_zero(p);

  // WEBASSEMBLY: call <4 x i32> @llvm.wasm.load32.zero(i32* %p)

clang/test/Headers/wasm.c

+77 −76

File changed.

Preview size limit exceeded, changes collapsed.