Fix tests with upstream polynomial RingAttr changes

Check llvm/llvm-project#111016

More constraints on coefficientModulus are defined so tests
are updated.

Author: ZenithalHourlyRate

lib/Conversion/PolynomialToStandard/PolynomialToStandard.cpp

@@ -815,9 +815,10 @@ func::FuncOp PolynomialToStandard::buildPolynomialModFunc(FunctionType funcType,
   IntPolynomialAttr xnMinusOneAttr =
       IntPolynomialAttr::get(&getContext(), xnMinusOne);
   // e.g., need to represent 2^64, which requires 65 bits, the highest one set.
+  // And one more sign bit as RingAttr interprets it as signed number.
   unsigned remCmodWidth =
-      1 + inputType.getElementType().getIntOrFloatBitWidth();
-  APInt remCmod = APInt::getOneBitSet(remCmodWidth, remCmodWidth - 1);
+      1 + 1 + inputType.getElementType().getIntOrFloatBitWidth();
+  APInt remCmod = APInt::getOneBitSet(remCmodWidth, remCmodWidth - 1 - 1);
   IntegerType remIntType = IntegerType::get(&getContext(), remCmodWidth);
   auto remRing =
       RingAttr::get(ring.getCoefficientType(),

tests/polynomial/lower_add.mlir

@@ -2,7 +2,7 @@
 
 #cycl_2048 = #polynomial.int_polynomial<1 + x**1024>
 #ring = #polynomial.ring<coefficientType = i32, coefficientModulus = 4294967296 : i64, polynomialModulus=#cycl_2048>
-#ring_prime = #polynomial.ring<coefficientType = i32, coefficientModulus = 4294967291 : i32, polynomialModulus=#cycl_2048>
+#ring_prime = #polynomial.ring<coefficientType = i32, coefficientModulus = 4294967291 : i64, polynomialModulus=#cycl_2048>
 
 
 // CHECK-LABEL: @test_lower_add_power_of_two_cmod

tests/polynomial/lower_mul_scalar.mlir

@@ -1,6 +1,6 @@
 // RUN: heir-opt --polynomial-to-standard %s | FileCheck %s
 
-!poly_ty = !polynomial.polynomial<ring=<coefficientType = i64, coefficientModulus = 18446744073709551616 : i65, polynomialModulus=#polynomial.int_polynomial<-1 + x**2047>>>
+!poly_ty = !polynomial.polynomial<ring=<coefficientType = i64, coefficientModulus = 18446744073709551616 : i128, polynomialModulus=#polynomial.int_polynomial<-1 + x**2047>>>
 
 // CHECK-LABEL: func.func @test_lower_mul_scalar
 // CHECK-SAME: (%[[ARG:.*]]: [[T:.*]])

tests/polynomial/lower_polynomial.mlir

@@ -2,7 +2,7 @@
 
 #cycl_2048 = #polynomial.int_polynomial<1 + x**1024>
 #ring = #polynomial.ring<coefficientType = i32, coefficientModulus = 4294967296 : i64, polynomialModulus=#cycl_2048>
-#ring_prime = #polynomial.ring<coefficientType = i32, coefficientModulus = 4294967291 : i32, polynomialModulus=#cycl_2048>
+#ring_prime = #polynomial.ring<coefficientType = i32, coefficientModulus = 4294967291 : i64, polynomialModulus=#cycl_2048>
 module {
   // CHECK-label: test_lower_from_tensor
   func.func @test_lower_from_tensor() -> !polynomial.polynomial<ring=#ring> {

tests/rns/syntax.mlir

@@ -4,10 +4,10 @@
 #ideal_2 = #polynomial.int_polynomial<1 + x**2048>
 
 // Below we use random 32-bit primes
-#ring_1 = #polynomial.ring<coefficientType = i32, coefficientModulus = 3721063133 : i32, polynomialModulus=#ideal>
-#ring_2 = #polynomial.ring<coefficientType = i32, coefficientModulus = 2737228591 : i32, polynomialModulus=#ideal>
-#ring_3 = #polynomial.ring<coefficientType = i32, coefficientModulus = 3180146689 : i32, polynomialModulus=#ideal>
-#ring_bad = #polynomial.ring<coefficientType = i32, coefficientModulus = 3180146689 : i32, polynomialModulus=#ideal_2>
+#ring_1 = #polynomial.ring<coefficientType = i32, coefficientModulus = 3721063133 : i64, polynomialModulus=#ideal>
+#ring_2 = #polynomial.ring<coefficientType = i32, coefficientModulus = 2737228591 : i64, polynomialModulus=#ideal>
+#ring_3 = #polynomial.ring<coefficientType = i32, coefficientModulus = 3180146689 : i64, polynomialModulus=#ideal>
+#ring_bad = #polynomial.ring<coefficientType = i32, coefficientModulus = 3180146689 : i64, polynomialModulus=#ideal_2>
 
 !poly_ty_1 = !polynomial.polynomial<ring=#ring_1>
 !poly_ty_2 = !polynomial.polynomial<ring=#ring_2>