Skip to content

Use quantized gemm only on aarch64 #2023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2025
Merged

Use quantized gemm only on aarch64 #2023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...kernels/cpu/aarch64/matmul/channelwise_8bit_a_channelwise_8bit_b_1x16x16_f32_smlal-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#pragma once

#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)

#include <algorithm>
#include <cassert>
Expand Down Expand Up @@ -381,4 +381,4 @@ void kernel(
} // namespace channelwise_8bit_a_channelwise_8bit_b_1x16x16_f32_smlal
} // namespace torchao::kernels::cpu::aarch64::quantized_matmul

#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)
4 changes: 2 additions & 2 deletions ...ernels/cpu/aarch64/matmul/channelwise_8bit_a_channelwise_8bit_b_1x8x16_f32_neondot-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#pragma once

#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)

#include <algorithm>
#include <cassert>
Expand Down Expand Up @@ -333,4 +333,4 @@ void kernel(
} // namespace channelwise_8bit_a_channelwise_8bit_b_1x8x16_f32_neondot
} // namespace torchao::kernels::cpu::aarch64::quantized_matmul

#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)
4 changes: 2 additions & 2 deletions ...experimental/kernels/cpu/aarch64/matmul/fp32_a_input_channelwise_8bit_b_1x16x4_f32_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#pragma once

#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)

#include <algorithm>
#include <cassert>
Expand Down Expand Up @@ -278,4 +278,4 @@ void kernel(
} // namespace fp32_a_input_channelwise_8bit_b_1x16x4_f32
} // namespace torchao::kernels::cpu::aarch64::quantized_matmul

#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)
4 changes: 2 additions & 2 deletions torchao/experimental/kernels/cpu/aarch64/matmul/matmul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#pragma once

#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)

#include <arm_neon.h>

Expand Down Expand Up @@ -92,4 +92,4 @@ void kernel(
#include <torchao/experimental/kernels/cpu/aarch64/matmul/channelwise_8bit_a_channelwise_8bit_b_1x8x16_f32_neondot-impl.h>
#include <torchao/experimental/kernels/cpu/aarch64/matmul/fp32_a_input_channelwise_8bit_b_1x16x4_f32_impl.h>

#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)
12 changes: 6 additions & 6 deletions torchao/experimental/kernels/cpu/interface/quantized_matmul.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
#include <torchao/experimental/kernels/cpu/fallback/matmul/channelwise_8bit_a_channelwise_8bit_b.h>
#include <torchao/experimental/kernels/cpu/fallback/matmul/fp32_a_channelwise_8bit_b_fp32_c.h>

#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)
#include <torchao/experimental/kernels/cpu/aarch64/matmul/channelwise_8bit_a_channelwise_8bit_b_1x16x16_f32_smlal-impl.h>
#include <torchao/experimental/kernels/cpu/aarch64/matmul/channelwise_8bit_a_channelwise_8bit_b_1x8x16_f32_neondot-impl.h>
#include <torchao/experimental/kernels/cpu/aarch64/matmul/fp32_a_input_channelwise_8bit_b_1x16x4_f32_impl.h>
#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)

namespace torchao::kernels::cpu::quantized_matmul {

Expand Down Expand Up @@ -67,15 +67,15 @@ get_int8_a_int8_b_channelwise_qmatmul(
bool b_transposed,
int& a_stride_m,
int& b_stride_n) {
#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)
if (!a_transposed && b_transposed && n >= 8) {
a_stride_m = k;
b_stride_n = k;
return aarch64::quantized_matmul::
channelwise_8bit_a_channelwise_8bit_b_1x8x16_f32_neondot::
kernel<true, true, false, true>;
}
#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)
assert(!a_transposed);
if (b_transposed) {
a_stride_m = k;
Expand Down Expand Up @@ -134,14 +134,14 @@ get_fp32_a_input_channelwise_8bit_b_f32_c_matmul(
bool b_transposed,
int& a_stride_m,
int& b_stride_n) {
#if defined(__aarch64__) || defined(__ARM_NEON)
#if defined(__aarch64__) && defined(__ARM_NEON)
if (!a_transposed && !b_transposed && n >= 16) {
a_stride_m = k;
b_stride_n = n;
return aarch64::quantized_matmul::
fp32_a_input_channelwise_8bit_b_1x16x4_f32::kernel<true, false, false>;
}
#endif // defined(__aarch64__) || defined(__ARM_NEON)
#endif // defined(__aarch64__) && defined(__ARM_NEON)
assert(!a_transposed);
if (b_transposed) {
a_stride_m = k;
Expand Down
Loading