diff options
| -rw-r--r-- | SConscript | 14 | ||||
| -rw-r--r-- | src/core/NEON/kernels/winograd/transforms/output_2x2_3x3/a64_float.hpp | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/SConscript b/SConscript index b40b66caab..91dc60166a 100644 --- a/SConscript +++ b/SConscript @@ -201,24 +201,18 @@ if env['gles_compute']: generate_embed.append(arm_compute_env.Command(embed_files, cs_files, action=resolve_includes)) -static_core_objects = [arm_compute_env.StaticObject(f) for f in core_files] -shared_core_objects = [arm_compute_env.SharedObject(f) for f in core_files] - -arm_compute_core_a = build_library('arm_compute_core-static', static_core_objects, static=True) +arm_compute_core_a = build_library('arm_compute_core-static', core_files, static=True) Export('arm_compute_core_a') if env['os'] != 'bare_metal' and not env['standalone']: - arm_compute_core_so = build_library('arm_compute_core', shared_core_objects, static=False) + arm_compute_core_so = build_library('arm_compute_core', core_files, static=False) Export('arm_compute_core_so') -shared_runtime_objects = [arm_compute_env.SharedObject(f) for f in runtime_files] -static_runtime_objects = [arm_compute_env.StaticObject(f) for f in runtime_files] - -arm_compute_a = build_library('arm_compute-static', static_runtime_objects, static=True, libs = [ arm_compute_core_a ]) +arm_compute_a = build_library('arm_compute-static', runtime_files, static=True, libs = [ arm_compute_core_a ]) Export('arm_compute_a') if env['os'] != 'bare_metal' and not env['standalone']: - arm_compute_so = build_library('arm_compute', shared_runtime_objects, static=False, libs = [ "arm_compute_core" ]) + arm_compute_so = build_library('arm_compute', runtime_files, static=False, libs = [ "arm_compute_core" ]) Depends(arm_compute_so, arm_compute_core_so) Export('arm_compute_so') diff --git a/src/core/NEON/kernels/winograd/transforms/output_2x2_3x3/a64_float.hpp b/src/core/NEON/kernels/winograd/transforms/output_2x2_3x3/a64_float.hpp index 5925f9d569..bf6ba907b9 100644 --- a/src/core/NEON/kernels/winograd/transforms/output_2x2_3x3/a64_float.hpp +++ b/src/core/NEON/kernels/winograd/transforms/output_2x2_3x3/a64_float.hpp @@ -296,7 +296,7 @@ inline void Winograd2x2_3x3GemmOutput<float>::_execute<false, false, 0>( "subs tile_i, tile_i, #1\n" "bne 2b\n" - "subs %[batch], %[batch], #1\n" + "subs %w[batch], %w[batch], #1\n" "bne 1b\n" ".unreq F11\n" ".unreq qF11\n" @@ -355,9 +355,9 @@ inline void Winograd2x2_3x3GemmOutput<float>::_execute<false, false, 0>( [mstride3] "r" (3 * mstride * sizeof(float)), [mrowpad] "r" ((matrix_row_stride - output_shape.n_channels) * sizeof(float)) : "x19", "x20", "x21", - "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11", - "q12", "q13", "q14", "q15", "q16", "q17", "q18", "q19", "q20", "q21", - "q22", "q23", "q24", "q25", "q26", "q27", + "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "v21", + "v22", "v23", "v24", "v25", "v26", "v27", "cc", "memory" ); } |