Skip to content

Relax negative scales conditions in Quant Dialect #61

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 3 commits into from
Oct 10, 2024
Merged

Relax negative scales conditions in Quant Dialect #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff8c28c
relax negative scale conditions
ZoranZomborat Sep 30, 2024
ec726ea
adapt tests now handling negative scales
ZoranZomborat Sep 30, 2024
d52b599
fix LIT tests
ZoranZomborat Oct 2, 2024
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 mlir/lib/Dialect/Quant/IR/QuantTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ LogicalResult UniformQuantizedType::verify(
return emitError() << "expressed type must be floating point";

// Verify scale.
if (scale <= 0.0 || std::isinf(scale) || std::isnan(scale))
if (std::isinf(scale) || std::isnan(scale))
return emitError() << "illegal scale: " << scale;

return success();
Expand Down Expand Up @@ -364,7 +364,7 @@ LogicalResult UniformQuantizedPerAxisType::verify(

// Verify scale.
for (double scale : scales) {
if (scale <= 0.0 || std::isinf(scale) || std::isnan(scale))
if (std::isinf(scale) || std::isnan(scale))
return emitError() << "illegal scale: " << scale;
}

Expand Down
5 changes: 0 additions & 5 deletions mlir/test/Dialect/Quant/parse-quantile-invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,6 @@ func.func @parse() -> !qalias {
// expected-error@+1 {{expected non-function type}}
!qalias = !quant.quantile<i8<-4:3>:f16:f33, {-1.0,1.0}:0.99872:127>

// -----
// Illegal scale: negative
// expected-error@+1 {{illegal scale: -1.000000}}
!qalias = !quant.quantile<i8<-4:3>:f16:f32, {-1.0,1.0}:-1.0:127>

// -----
// Illegal uniform params: missing quantized dimension
// expected-error@+1 {{expected integer value}}
Expand Down
18 changes: 18 additions & 0 deletions mlir/test/Dialect/Quant/parse-quantile.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,21 @@ func.func @parse() -> !qalias {
%0 = "foo"() : () -> !qalias
return %0 : !qalias
}

// -----
// Negative scale checking
// CHECK: !quant.quantile<i4:f16:f32, {-1.000000e+00,-8.667000e-01,-7.333000e-01,-6.000000e-01,-4.667000e-01,-3.333000e-01,-2.000000e-01,-0.066699999999999995,0.066699999999999995,2.000000e-01,3.333000e-01,4.667000e-01,6.000000e-01,7.333000e-01,8.667000e-01,1.000000e+00}:-2.000000e+02>
!qalias = !quant.quantile<i4:f16:f32, {-1.0000,-0.8667,-0.7333,-0.6000,-0.4667,-0.3333,-0.2000,-0.0667,0.0667,0.2000,0.3333,0.4667,0.6000,0.7333,0.8667,1.0000}:-2.0e+2>
func.func @parse() -> !qalias {
%0 = "foo"() : () -> !qalias
return %0 : !qalias
}

// -----
// Per-axis negative scale checking
// CHECK: !quant.quantile<i4:f16:f32:1, {-1.000000e+00,-8.667000e-01,-7.333000e-01,-6.000000e-01,-4.667000e-01,-3.333000e-01,-2.000000e-01,-0.066699999999999995,0.066699999999999995,2.000000e-01,3.333000e-01,4.667000e-01,6.000000e-01,7.333000e-01,8.667000e-01,1.000000e+00}:{-2.000000e+02,-9.987200e-01:120}>
!qalias = !quant.quantile<i4:f16:f32:1, {-1.0000,-0.8667,-0.7333,-0.6000,-0.4667,-0.3333,-0.2000,-0.0667,0.0667,0.2000,0.3333,0.4667,0.6000,0.7333,0.8667,1.0000}:{-2.0e+2,-0.99872:120}>
func.func @parse() -> !qalias {
%0 = "foo"() : () -> !qalias
return %0 : !qalias
}
5 changes: 0 additions & 5 deletions mlir/test/Dialect/Quant/parse-uniform-invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,6 @@
// expected-error@+1 {{expected non-function type}}
!qalias = !quant.uniform<i8<-4:3>:f33, 0.99872:127>

// -----
// Illegal scale: negative
// expected-error@+1 {{illegal scale: -1.000000}}
!qalias = !quant.uniform<i8<-4:3>:f32, -1.0:127>

// -----
// Illegal uniform params: missing quantized dimension
// expected-error@+1 {{expected integer value}}
Expand Down
18 changes: 18 additions & 0 deletions mlir/test/Dialect/Quant/parse-uniform.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,21 @@ func.func @parse() -> !qalias {
%0 = "foo"() : () -> !qalias
return %0 : !qalias
}

// -----
// Negative scale checking
// CHECK: !quant.uniform<i8:f32, -2.000000e+02>
!qalias = !quant.uniform<i8:f32, -2.0e+2>
func.func @parse() -> !qalias {
%0 = "foo"() : () -> !qalias
return %0 : !qalias
}

// -----
// Per axis negative scale checking
// CHECK: !quant.uniform<i8:f32:1, {-2.000000e+02,-9.987200e-01:120}>
!qalias = !quant.uniform<i8:f32:1, {-2.0e+2,-0.99872:120}>
func.func @parse() -> !qalias {
%0 = "foo"() : () -> !qalias
return %0 : !qalias
}