Implement the alignment parameter in cg_clif

Author: sayantn

compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

@@ -19,9 +19,9 @@ mod simd;
 
 use cranelift_codegen::ir::AtomicRmwOp;
 use rustc_middle::ty;
-use rustc_middle::ty::GenericArgsRef;
 use rustc_middle::ty::layout::ValidityRequirement;
 use rustc_middle::ty::print::{with_no_trimmed_paths, with_no_visible_paths};
+use rustc_middle::ty::{GenericArgsRef, SimdAlign};
 use rustc_span::source_map::Spanned;
 use rustc_span::{Symbol, sym};
 

compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs

@@ -960,6 +960,15 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
  let lane_clif_ty = fx.clif_type(val_lane_ty).unwrap();
  let ptr_val = ptr.load_scalar(fx);
 
+ let alignment = generic_args[3].expect_const().to_value().valtree.unwrap_branch()[0]
+ .unwrap_leaf()
+ .to_simd_alignment();
+
+ let memflags = match alignment {
+ SimdAlign::Unaligned => MemFlags::new().with_notrap(),
+ _ => MemFlags::trusted(),
+ };
+
  for lane_idx in 0..val_lane_count {
  let val_lane = val.value_lane(fx, lane_idx).load_scalar(fx);
  let mask_lane = mask.value_lane(fx, lane_idx).load_scalar(fx);
@@ -972,7 +981,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
 
  fx.bcx.switch_to_block(if_enabled);
  let offset = lane_idx as i32 * lane_clif_ty.bytes() as i32;
- fx.bcx.ins().store(MemFlags::trusted(), val_lane, ptr_val, Offset32::new(offset));
+ fx.bcx.ins().store(memflags, val_lane, ptr_val, Offset32::new(offset));
  fx.bcx.ins().jump(next, &[]);
 
  fx.bcx.seal_block(next);
@@ -996,6 +1005,15 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
  let lane_clif_ty = fx.clif_type(val_lane_ty).unwrap();
  let ret_lane_layout = fx.layout_of(ret_lane_ty);
 
+ let alignment = generic_args[3].expect_const().to_value().valtree.unwrap_branch()[0]
+ .unwrap_leaf()
+ .to_simd_alignment();
+
+ let memflags = match alignment {
+ SimdAlign::Unaligned => MemFlags::new().with_notrap(),
+ _ => MemFlags::trusted(),
+ };
+
  for lane_idx in 0..ptr_lane_count {
  let val_lane = val.value_lane(fx, lane_idx).load_scalar(fx);
  let ptr_lane = ptr.value_lane(fx, lane_idx).load_scalar(fx);
@@ -1011,7 +1029,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
  fx.bcx.seal_block(if_disabled);
 
  fx.bcx.switch_to_block(if_enabled);
- let res = fx.bcx.ins().load(lane_clif_ty, MemFlags::trusted(), ptr_lane, 0);
+ let res = fx.bcx.ins().load(lane_clif_ty, memflags, ptr_lane, 0);
  fx.bcx.ins().jump(next, &[res.into()]);
 
  fx.bcx.switch_to_block(if_disabled);