fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-14 22:55:40 +00:00
Code Issues Projects Releases Wiki Activity

When accessing memory, use byte aligned accesses.

Browse Source 
LLVM's instcombine will attempt to bump the alignment when it can prove that it's safe to do so.

Fixes #969.
This commit is contained in:
Nick Lewycky 2019-11-15 13:07:05 -08:00
parent 182e53bf28
commit ebe8da7bd3
1 changed files with 141 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
lib/llvm-backend/src/code.rs
View File

@ -4469,6 +4469,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
4, 4,
)?; )?;
let result = builder.build_load(effective_address, &state.var_name()); let result = builder.build_load(effective_address, &state.var_name());
result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4492,6 +4497,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
8, 8,
)?; )?;
let result = builder.build_load(effective_address, &state.var_name()); let result = builder.build_load(effective_address, &state.var_name());
result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4515,6 +4525,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
4, 4,
)?; )?;
let result = builder.build_load(effective_address, &state.var_name()); let result = builder.build_load(effective_address, &state.var_name());
result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4538,6 +4553,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
8, 8,
)?; )?;
let result = builder.build_load(effective_address, &state.var_name()); let result = builder.build_load(effective_address, &state.var_name());
result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4561,6 +4581,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
16, 16,
)?; )?;
let result = builder.build_load(effective_address, &state.var_name()); let result = builder.build_load(effective_address, &state.var_name());
result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4586,6 +4611,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
4, 4,
)?; )?;
let store = builder.build_store(effective_address, value); let store = builder.build_store(effective_address, value);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::I64Store { ref memarg } => { Operator::I64Store { ref memarg } => {
@ -4603,6 +4629,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
8, 8,
)?; )?;
let store = builder.build_store(effective_address, value); let store = builder.build_store(effective_address, value);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::F32Store { ref memarg } => { Operator::F32Store { ref memarg } => {
@ -4621,6 +4648,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
4, 4,
)?; )?;
let store = builder.build_store(effective_address, v); let store = builder.build_store(effective_address, v);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::F64Store { ref memarg } => { Operator::F64Store { ref memarg } => {
@ -4639,6 +4667,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
8, 8,
)?; )?;
let store = builder.build_store(effective_address, v); let store = builder.build_store(effective_address, v);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::V128Store { ref memarg } => { Operator::V128Store { ref memarg } => {
@ -4657,6 +4686,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
16, 16,
)?; )?;
let store = builder.build_store(effective_address, v); let store = builder.build_store(effective_address, v);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::I32Load8S { ref memarg } => { Operator::I32Load8S { ref memarg } => {
@ -4672,9 +4702,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i8_ptr_ty, intrinsics.i8_ptr_ty,
1, 1,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4682,8 +4715,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_s_extend(
builder.build_int_s_extend(narrow_result, intrinsics.i32_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i32_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
Operator::I32Load16S { ref memarg } => { Operator::I32Load16S { ref memarg } => {
@ -4700,6 +4736,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
2, 2,
)?; )?;
let narrow_result = builder.build_load(effective_address, &state.var_name()); let narrow_result = builder.build_load(effective_address, &state.var_name());
narrow_result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4730,6 +4771,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
let narrow_result = builder let narrow_result = builder
.build_load(effective_address, &state.var_name()) .build_load(effective_address, &state.var_name())
.into_int_value(); .into_int_value();
narrow_result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4757,6 +4803,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
let narrow_result = builder let narrow_result = builder
.build_load(effective_address, &state.var_name()) .build_load(effective_address, &state.var_name())
.into_int_value(); .into_int_value();
narrow_result
.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4781,9 +4832,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i32_ptr_ty, intrinsics.i32_ptr_ty,
4, 4,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4791,8 +4845,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_s_extend(
builder.build_int_s_extend(narrow_result, intrinsics.i64_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i64_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
@ -4809,9 +4866,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i8_ptr_ty, intrinsics.i8_ptr_ty,
1, 1,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4819,8 +4879,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_z_extend(
builder.build_int_z_extend(narrow_result, intrinsics.i32_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i32_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
Operator::I32Load16U { ref memarg } => { Operator::I32Load16U { ref memarg } => {
@ -4836,9 +4899,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i16_ptr_ty, intrinsics.i16_ptr_ty,
2, 2,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4846,8 +4912,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_z_extend(
builder.build_int_z_extend(narrow_result, intrinsics.i32_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i32_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
Operator::I64Load8U { ref memarg } => { Operator::I64Load8U { ref memarg } => {
@ -4863,9 +4932,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i8_ptr_ty, intrinsics.i8_ptr_ty,
1, 1,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4873,8 +4945,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_z_extend(
builder.build_int_z_extend(narrow_result, intrinsics.i64_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i64_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
Operator::I64Load16U { ref memarg } => { Operator::I64Load16U { ref memarg } => {
@ -4890,9 +4965,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i16_ptr_ty, intrinsics.i16_ptr_ty,
2, 2,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4900,8 +4978,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_z_extend(
builder.build_int_z_extend(narrow_result, intrinsics.i64_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i64_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
Operator::I64Load32U { ref memarg } => { Operator::I64Load32U { ref memarg } => {
@ -4917,9 +4998,12 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
intrinsics.i32_ptr_ty, intrinsics.i32_ptr_ty,
4, 4,
)?; )?;
let narrow_result = builder let narrow_result = builder.build_load(effective_address, &state.var_name());
.build_load(effective_address, &state.var_name()) narrow_result
.into_int_value(); .as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -4927,8 +5011,11 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
narrow_result.as_instruction_value().unwrap(), narrow_result.as_instruction_value().unwrap(),
Some(0), Some(0),
); );
let result = let result = builder.build_int_z_extend(
builder.build_int_z_extend(narrow_result, intrinsics.i64_ty, &state.var_name()); narrow_result.into_int_value(),
intrinsics.i64_ty,
&state.var_name(),
);
state.push1(result); state.push1(result);
} }
@ -4949,6 +5036,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
let narrow_value = let narrow_value =
builder.build_int_truncate(value, intrinsics.i8_ty, &state.var_name()); builder.build_int_truncate(value, intrinsics.i8_ty, &state.var_name());
let store = builder.build_store(effective_address, narrow_value); let store = builder.build_store(effective_address, narrow_value);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::I32Store16 { ref memarg } | Operator::I64Store16 { ref memarg } => { Operator::I32Store16 { ref memarg } | Operator::I64Store16 { ref memarg } => {
@ -4968,6 +5056,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
let narrow_value = let narrow_value =
builder.build_int_truncate(value, intrinsics.i16_ty, &state.var_name()); builder.build_int_truncate(value, intrinsics.i16_ty, &state.var_name());
let store = builder.build_store(effective_address, narrow_value); let store = builder.build_store(effective_address, narrow_value);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::I64Store32 { ref memarg } => { Operator::I64Store32 { ref memarg } => {
@ -4987,6 +5076,7 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
let narrow_value = let narrow_value =
builder.build_int_truncate(value, intrinsics.i32_ty, &state.var_name()); builder.build_int_truncate(value, intrinsics.i32_ty, &state.var_name());
let store = builder.build_store(effective_address, narrow_value); let store = builder.build_store(effective_address, narrow_value);
store.set_alignment(1).unwrap();
tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0)); tbaa_label(self.module.clone(), intrinsics, "memory", store, Some(0));
} }
Operator::I8x16Neg => { Operator::I8x16Neg => {
@ -5291,6 +5381,10 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
1, 1,
)?; )?;
let elem = builder.build_load(effective_address, ""); let elem = builder.build_load(effective_address, "");
elem.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -5322,6 +5416,10 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
2, 2,
)?; )?;
let elem = builder.build_load(effective_address, ""); let elem = builder.build_load(effective_address, "");
elem.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -5353,6 +5451,10 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
4, 4,
)?; )?;
let elem = builder.build_load(effective_address, ""); let elem = builder.build_load(effective_address, "");
elem.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,
@ -5384,6 +5486,10 @@ impl FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator {
8, 8,
)?; )?;
let elem = builder.build_load(effective_address, ""); let elem = builder.build_load(effective_address, "");
elem.as_instruction_value()
.unwrap()
.set_alignment(1)
.unwrap();
tbaa_label( tbaa_label(
self.module.clone(), self.module.clone(),
intrinsics, intrinsics,