Merge pull request #115 from Xilinx/tiagot.support_more_configuration…

…s_gridsample feat: add 'reflection' padding_mode and 'nearest' and 'cubic' mode in xten_nn.grid_sample.
Xilinx · Nov 29, 2024 · eb1cc2b · eb1cc2b
2 parents 8eb043f + 3b29650
commit eb1cc2b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/Dialect/XTenNN/IR/XTenNNOps.cpp b/lib/Dialect/XTenNN/IR/XTenNNOps.cpp
@@ -608,11 +608,11 @@ static std::string getOpInvalidModeOption(ArrayRef<const char *> subOptions,
 
 LogicalResult amd::xten_nn::GridSampleOp::verify() {
 
-  constexpr std::array mode{"bilinear"};
+  constexpr std::array mode{"bilinear", "nearest", "cubic"};
   if (getMode() > mode.size() - 1) {
     return emitOpError(getOpInvalidModeOption(mode, getModeAttrName()));
   }
-  constexpr std::array paddingMode{"zeros", "border"};
+  constexpr std::array paddingMode{"zeros", "border", "reflection"};
   if (getPaddingMode() > paddingMode.size() - 1) {
     return emitOpError(
         getOpInvalidModeOption(paddingMode, getPaddingModeAttrName()));

diff --git a/test/Dialect/XTenNN/grid_sample.mlir b/test/Dialect/XTenNN/grid_sample.mlir
@@ -17,18 +17,17 @@ func.func @test_grid_sample_valid3(%arg0: tensor<1x3x1152x1344xf32>, %arg1: tens
   return %0 : tensor<*xf32>
 }
 
-// -----
-
-func.func @test_grid_sample_no_padding_mode(%arg0: tensor<1x3x1152x1344xf32>, %arg1: tensor<1x1152x1344x2xf32>) -> tensor<*xf32> {
-  // expected-error@+1 {{Valid values for 'padding_mode' option are: 'zeros'(0), 'border'(1)}}
+func.func @test_grid_sample_reflection(%arg0: tensor<1x3x1152x1344xf32>, %arg1: tensor<1x1152x1344x2xf32>) -> tensor<*xf32> {
   %0 = "xten_nn.grid_sample"(%arg0, %arg1) {align_corners = 1 : i64, mode = 0 : i64, padding_mode = 2 : i64} : (tensor<1x3x1152x1344xf32>, tensor<1x1152x1344x2xf32>) -> tensor<*xf32>
   return %0 : tensor<*xf32>
 }
 
-// -----
-
-func.func @test_grid_sample_interpolate_mode(%arg0: tensor<1x3x1152x1344xf32>, %arg1: tensor<1x1152x1344x2xf32>) -> tensor<*xf32> {
-  // expected-error@+1 {{Valid values for 'mode' option are: 'bilinear'(0)}}
+func.func @test_grid_sample_interpolate_nearest(%arg0: tensor<1x3x1152x1344xf32>, %arg1: tensor<1x1152x1344x2xf32>) -> tensor<*xf32> {
   %0 = "xten_nn.grid_sample"(%arg0, %arg1) {align_corners = 1 : i64, mode = 1 : i64, padding_mode = 1 : i64} : (tensor<1x3x1152x1344xf32>, tensor<1x1152x1344x2xf32>) -> tensor<*xf32>
   return %0 : tensor<*xf32>
 }
+
+func.func @test_grid_sample_interpolate_cubic(%arg0: tensor<1x3x1152x1344xf32>, %arg1: tensor<1x1152x1344x2xf32>) -> tensor<*xf32> {
+  %0 = "xten_nn.grid_sample"(%arg0, %arg1) {align_corners = 1 : i64, mode = 2 : i64, padding_mode = 1 : i64} : (tensor<1x3x1152x1344xf32>, tensor<1x1152x1344x2xf32>) -> tensor<*xf32>
+  return %0 : tensor<*xf32>
+}