gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ir] deleted mask/merge instructions; will be replaced by masked_load/store and select

Browse Source
This commit is contained in:
Philippe Tillet
2019-07-25 15:06:15 -07:00
parent 6ce82dfcdb
commit 2a377bc8b1
27 changed files with 387 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/lang/expression.cpp
View File

@@ -115,12 +115,6 @@ ir::value* alloc_const_expression::codegen(ir::module *mod) const {
return res;
}
// get_global_range
ir::value* get_global_range_expression::codegen(ir::module *mod) const {
ir::builder &builder = mod->get_builder();
return builder.create_get_global_range(axis_->value(), (ir::constant_int*)size_->codegen(mod));
}
// get_range_id
ir::value* get_range_id_expression::codegen(ir::module *mod) const {
return mod->get_builder().create_get_range_id(axis_->value());
@@ -254,39 +248,24 @@ ir::value* cast_expression::codegen(ir::module *mod) const{
}
/* Conditional expression */
ir::value *conditional_expression::codegen(ir::module *mod) const{
ir::value *conditional_expression::codegen(ir::module *mod) const {
ir::builder &builder = mod->get_builder();
ir::value *mask = cond_->codegen(mod);
ir::value *true_value = true_value_->codegen(mod);
ir::value *false_value = false_value_->codegen(mod);
bool is_float, is_ptr, is_int, is_signed;
implicit_cast(builder, true_value, false_value, is_float, is_ptr, is_int, is_signed);
implicit_broadcast(mod, mask, true_value);
implicit_broadcast(mod, mask, false_value);
if(ir::load_inst* load = dynamic_cast<ir::load_inst*>(true_value)){
load->erase_from_parent();
return builder.create_masked_load(load->get_pointer_operand(), mask, false_value);
}
if(ir::load_inst* load = dynamic_cast<ir::load_inst*>(false_value)){
load->erase_from_parent();
return builder.create_masked_load(load->get_pointer_operand(), mask, true_value);
}
throw std::runtime_error("not implemented");
// ir::builder &builder = mod->get_builder();
// ir::basic_block::inst_list_t &instructions = builder.get_insert_block()->get_inst_list();
// ir::value *pred = cond_->codegen(mod);
// ir::instruction *mask = (ir::instruction*)builder.create_mask(pred);
// /* true value */
// ir::value *true_mask = mask->get_result(0);
// auto it_true_begin = instructions.end();
// it_true_begin--;
// ir::value *true_value = true_value_->codegen(mod);
// implicit_broadcast(mod, pred, true_value);
// it_true_begin++;
// auto it_true_end = instructions.end();
// for(auto it = it_true_begin; it != it_true_end; it++)
//// if(!dynamic_cast<ir::retile_inst*>(*it))
// (*it)->set_mask_pred(true_mask);
// /* false value */
// ir::value *false_mask = mask->get_result(1);
// auto it_false_begin = instructions.end();
// it_false_begin--;
// ir::value *false_value = false_value_->codegen(mod);
// implicit_broadcast(mod, pred, false_value);
// bool is_float, is_ptr, is_int, is_signed;
// implicit_cast(builder, true_value, false_value, is_float, is_ptr, is_int, is_signed);
// it_false_begin++;
// auto it_false_end = instructions.end();
// for(auto it = it_false_begin; it != it_false_end; it++)
//// if(!dynamic_cast<ir::retile_inst*>(*it))
// (*it)->set_mask_pred(false_mask);
// /* psi */
// ir::value *result = builder.create_merge(true_mask, true_value, false_mask, false_value);
// return result;
}
/* Assignment expression */