Browse Source

!4537 disable arm32 assembly

Merge pull request !4537 from sunsuodong/arm32
tags/v0.7.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
4b5549a6e9
4 changed files with 31 additions and 31 deletions
  1. +9
    -9
      mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc
  2. +9
    -9
      mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc
  3. +9
    -9
      mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc
  4. +4
    -4
      mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc

+ 9
- 9
mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc View File

@@ -42,13 +42,13 @@ int ConvolutionCPUKernel::InitWeightBias() {
int ic4 = UP_DIV(in_channel, C4NUM);
int kernel_plane = kernel_h * kernel_w;
int oc_block, oc_block_num;
#ifdef ENABLE_ARM32
oc_block = C4NUM;
oc_block_num = UP_DIV(out_channel, C4NUM);
#else
// #ifdef ENABLE_ARM32
// oc_block = C4NUM;
// oc_block_num = UP_DIV(out_channel, C4NUM);
// #else
oc_block = C8NUM;
oc_block_num = UP_DIV(out_channel, C8NUM);
#endif
// #endif
int pack_weight_size = oc_block_num * oc_block * ic4 * C4NUM * kernel_plane;

// init weight
@@ -130,11 +130,11 @@ void ConvolutionCPUKernel::ConfigInputOutput() {
MS_LOG(ERROR) << "Check layout failed.";
return;
}
#ifdef ENABLE_ARM32
gemm_func_ = IndirectGemmFp32_8x4;
#else
// #ifdef ENABLE_ARM32
// gemm_func_ = IndirectGemmFp32_8x4;
// #else
gemm_func_ = IndirectGemmFp32_8x8;
#endif
// #endif
}

int ConvolutionCPUKernel::Init() {


+ 9
- 9
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc View File

@@ -54,13 +54,13 @@ int Convolution3x3CPUKernel::InitWeightBias() {
int iC4 = UP_DIV(input_channel, C4NUM);
int oC4 = UP_DIV(output_channel, C4NUM);
int oc_block, oc_block_num;
#ifdef ENABLE_ARM32
oc_block = C4NUM;
oc_block_num = UP_DIV(output_channel, C4NUM);
#else
// #ifdef ENABLE_ARM32
// oc_block = C4NUM;
// oc_block_num = UP_DIV(output_channel, C4NUM);
// #else
oc_block = C8NUM;
oc_block_num = UP_DIV(output_channel, C8NUM);
#endif
// #endif
const int k_plane = 16;
// init weight
size_t transformed_size = iC4 * C4NUM * oc_block_num * oc_block * k_plane * sizeof(float);
@@ -158,11 +158,11 @@ void Convolution3x3CPUKernel::ConfigInputOutput() {
MS_LOG(ERROR) << "Check layout failed.";
return;
}
#ifdef ENABLE_ARM32
gemm_func_ = IndirectGemmFp32_8x4;
#else
// #ifdef ENABLE_ARM32
// gemm_func_ = IndirectGemmFp32_8x4;
// #else
gemm_func_ = IndirectGemmFp32_8x8;
#endif
// #endif
}

int Convolution3x3CPUKernel::Init() {


+ 9
- 9
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc View File

@@ -93,13 +93,13 @@ int ConvolutionWinogradCPUKernel::InitWeightBias() {
int output_channel = conv_param_->output_channel_;
int oc4 = UP_DIV(output_channel, C4NUM);
int oc_block, oc_block_num;
#ifdef ENABLE_ARM32
oc_block = C4NUM;
oc_block_num = UP_DIV(output_channel, C4NUM);
#else
// #ifdef ENABLE_ARM32
// oc_block = C4NUM;
// oc_block_num = UP_DIV(output_channel, C4NUM);
// #else
oc_block = C8NUM;
oc_block_num = UP_DIV(output_channel, C8NUM);
#endif
// #endif

// init weight
auto ret = MallocFilterMatrix(oc_block, oc_block_num);
@@ -242,11 +242,11 @@ int ConvolutionWinogradCPUKernel::ConfigInputOutput() {
MS_LOG(ERROR) << "Get output_trans_func_ failed.";
return RET_ERROR;
}
#ifdef ENABLE_ARM32
gemm_func_ = IndirectGemmFp32_8x4;
#else
// #ifdef ENABLE_ARM32
// gemm_func_ = IndirectGemmFp32_8x4;
// #else
gemm_func_ = IndirectGemmFp32_8x8;
#endif
// #endif
return RET_OK;
}



+ 4
- 4
mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc View File

@@ -32,10 +32,10 @@ using mindspore::schema::PrimitiveType_Conv2D;
namespace mindspore::kernel {
void ConvolutionInt8CPUKernel::CheckSupportOptimize() {
tile_num_ = 24;
#ifdef ENABLE_ARM32
tile_num_ = 2;
support_optimize_ = false;
#endif
// #ifdef ENABLE_ARM32
// tile_num_ = 2;
// support_optimize_ = false;
// #endif

#ifdef ENABLE_ARM64
void *optimize_op_handler = OptimizeModule::GetInstance()->optimized_op_handler_;


Loading…
Cancel
Save