added tests and passthrough discardable attrs

Author: fabianmcg

mlir/include/mlir/Dialect/GPU/IR/GPUDialect.h

@@ -202,7 +202,6 @@ class SparseSpGEMMOpHandleType
 
   static constexpr StringLiteral name = "gpu.sparse.spgemmop_handle";
 };
-
 } // namespace gpu
 } // namespace mlir
 

mlir/lib/Target/LLVM/NVVM/Target.cpp

@@ -598,13 +598,16 @@ NVVMTargetAttrImpl::createObject(Attribute attribute, Operation *module,
                                  const gpu::TargetOptions &options) const {
   auto target = cast<NVVMTargetAttr>(attribute);
   gpu::CompilationTarget format = options.getCompilationTarget();
-  DictionaryAttr objectProps;
+  DictionaryAttr objectProps = module->getDiscardableAttrDictionary();
   Builder builder(attribute.getContext());
-  if (format == gpu::CompilationTarget::Assembly)
-    objectProps = builder.getDictionaryAttr(
-        {builder.getNamedAttr("O", builder.getI32IntegerAttr(target.getO()))});
+  if (format == gpu::CompilationTarget::Assembly) {
+    SmallVector<NamedAttribute, 1> attrs(objectProps.getValue());
+    attrs.push_back(
+        builder.getNamedAttr("O", builder.getI32IntegerAttr(target.getO())));
+    objectProps = builder.getDictionaryAttr(attrs);
+  }
   return builder.getAttr<gpu::ObjectAttr>(
       attribute, format,
       builder.getStringAttr(StringRef(object.data(), object.size())),
-      objectProps);
+      objectProps.empty() ? nullptr : objectProps);
 }

mlir/lib/Target/LLVM/ROCDL/Target.cpp

@@ -477,10 +477,12 @@ ROCDLTargetAttrImpl::createObject(Attribute attribute, Operation *module,
                                   const SmallVector<char, 0> &object,
                                   const gpu::TargetOptions &options) const {
   gpu::CompilationTarget format = options.getCompilationTarget();
+  DictionaryAttr objectProps = module->getDiscardableAttrDictionary();
   Builder builder(attribute.getContext());
   return builder.getAttr<gpu::ObjectAttr>(
       attribute,
       format > gpu::CompilationTarget::Binary ? gpu::CompilationTarget::Binary
                                               : format,
-      builder.getStringAttr(StringRef(object.data(), object.size())), nullptr);
+      builder.getStringAttr(StringRef(object.data(), object.size())),
+      objectProps.empty() ? nullptr : objectProps);
 }

mlir/lib/Target/SPIRV/Target.cpp

@@ -93,10 +93,10 @@ SPIRVTargetAttrImpl::createObject(Attribute attribute, Operation *module,
                                   const SmallVector<char, 0> &object,
                                   const gpu::TargetOptions &options) const {
   gpu::CompilationTarget format = options.getCompilationTarget();
-  DictionaryAttr objectProps;
+  DictionaryAttr objectProps = module->getDiscardableAttrDictionary();
   Builder builder(attribute.getContext());
   return builder.getAttr<gpu::ObjectAttr>(
       attribute, format,
       builder.getStringAttr(StringRef(object.data(), object.size())),
-      objectProps);
+      objectProps.empty() ? nullptr : objectProps);
 }

mlir/test/Dialect/GPU/module-to-binary-nvvm.mlir

@@ -34,4 +34,14 @@ module attributes {gpu.container_module} {
       llvm.return
     }
   }
+
+  // CHECK-LABEL:gpu.binary @kernel_module4
+  // CHECK-ISA:[#gpu.object<#nvvm.target<flags = {fast}>, properties = {O = 2 : i32, gpu.reg_count = 255 : i32}, assembly = "{{.*}}">]
+  gpu.module @kernel_module4 [#nvvm.target<flags = {fast}>] attributes {gpu.reg_count = 255 : i32} {
+    llvm.func @kernel(%arg0: i32, %arg1: !llvm.ptr,
+        %arg2: !llvm.ptr, %arg3: i64, %arg4: i64,
+        %arg5: i64) attributes {gpu.kernel} {
+      llvm.return
+    }
+  }
 }

mlir/test/Dialect/GPU/module-to-binary-rocdl.mlir

@@ -22,4 +22,14 @@ module attributes {gpu.container_module} {
       llvm.return
     }
   }
+
+  // CHECK-LABEL:gpu.binary @kernel_module3
+  // CHECK-ISA:[#gpu.object<#rocdl.target<flags = {fast}>, properties = {gpu.reg_count = 255 : i32}, assembly = "{{.*}}">]
+  gpu.module @kernel_module3 [#rocdl.target<flags = {fast}>] attributes {gpu.reg_count = 255 : i32} {
+    llvm.func @kernel(%arg0: i32, %arg1: !llvm.ptr,
+        %arg2: !llvm.ptr, %arg3: i64, %arg4: i64,
+        %arg5: i64) attributes {gpu.kernel} {
+      llvm.return
+    }
+  }
 }

mlir/test/Dialect/GPU/module-to-binary-spirv.mlir

@@ -10,4 +10,13 @@ module attributes {gpu.container_module} {
       }
     }
   }
+  // CHECK-LABEL:gpu.binary @kernel_module1
+  // CHECK:[#gpu.object<#spirv.target_env<#spirv.vce<v1.0, [Int64, Int16, Kernel, Addresses], []>, #spirv.resource_limits<>>, properties = {gpu.reg_count = 255 : i32}, "{{.*}}">]
+  gpu.module @kernel_module1 [#spirv.target_env<#spirv.vce<v1.0, [Int64, Int16, Kernel, Addresses], []>, #spirv.resource_limits<>>] attributes {gpu.reg_count = 255 : i32} {
+    spirv.module @__spv__kernel_module Physical64 OpenCL requires #spirv.vce<v1.0, [Int64, Int16, Kernel, Addresses], []> attributes {spirv.target_env = #spirv.target_env<#spirv.vce<v1.0, [Addresses, Float16Buffer, Int64, Int16, Int8, Kernel, Linkage, Vector16, GenericPointer, Groups, Float16, Float64, AtomicFloat32AddEXT, ExpectAssumeKHR], [SPV_EXT_shader_atomic_float_add, SPV_KHR_expect_assume, SPV_AMD_shader_ballot]>, api=OpenCL, #spirv.resource_limits<>>} {
+      spirv.func @test_kernel(%arg0: !spirv.ptr<!spirv.array<200 x i16>, CrossWorkgroup>, %arg1: !spirv.ptr<!spirv.array<200 x i16>, CrossWorkgroup>, %arg2: !spirv.ptr<!spirv.array<200 x i16>, CrossWorkgroup>) "None" attributes {workgroup_attributions = 0 : i64} {
+        spirv.Return
+      }
+    }
+  }
 }