Skip to content

Commit

Permalink
AMDGPU: Add s-memrealtime and s-memtime-inst to RemoveIncompatibleFun…
Browse files Browse the repository at this point in the history
…ctions

Summary:
 Under -O0, device-libs may still emit these instructions under conditions.
So we need to remove them with warning if not compatible.

Fixes: SWDEV-417219

Reviewers:
  arsenm, Pierre-vh and b-sumner

Differential Revision:
  https://reviews.llvm.org/D158316

Change-Id: Ie7c2d5318f69f6cefd41eeb3439dbeb1695aa15d
  • Loading branch information
changpeng authored and zhang2amd committed Aug 29, 2023
1 parent a4bfc29 commit d1e13c5
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 7 deletions.
23 changes: 16 additions & 7 deletions llvm/lib/Target/AMDGPU/AMDGPURemoveIncompatibleFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,22 @@ const SubtargetSubTypeKV *getGPUInfo(const GCNSubtarget &ST,
}

constexpr unsigned FeaturesToCheck[] = {
AMDGPU::FeatureGFX11Insts, AMDGPU::FeatureGFX10Insts,
AMDGPU::FeatureGFX9Insts, AMDGPU::FeatureGFX8Insts,
AMDGPU::FeatureDPP, AMDGPU::Feature16BitInsts,
AMDGPU::FeatureDot1Insts, AMDGPU::FeatureDot2Insts,
AMDGPU::FeatureDot3Insts, AMDGPU::FeatureDot4Insts,
AMDGPU::FeatureDot5Insts, AMDGPU::FeatureDot6Insts,
AMDGPU::FeatureDot7Insts, AMDGPU::FeatureDot8Insts,
AMDGPU::FeatureGFX11Insts,
AMDGPU::FeatureGFX10Insts,
AMDGPU::FeatureGFX9Insts,
AMDGPU::FeatureGFX8Insts,
AMDGPU::FeatureDPP,
AMDGPU::Feature16BitInsts,
AMDGPU::FeatureDot1Insts,
AMDGPU::FeatureDot2Insts,
AMDGPU::FeatureDot3Insts,
AMDGPU::FeatureDot4Insts,
AMDGPU::FeatureDot5Insts,
AMDGPU::FeatureDot6Insts,
AMDGPU::FeatureDot7Insts,
AMDGPU::FeatureDot8Insts,
AMDGPU::FeatureSMemRealTime,
AMDGPU::FeatureSMemTimeInst
};

FeatureBitset expandImpliedFeatures(const FeatureBitset &Features) {
Expand Down
72 changes: 72 additions & 0 deletions llvm/test/CodeGen/AMDGPU/remove-incompatible-s-time.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -march=amdgcn -mcpu=gfx1030 -stop-after=amdgpu-remove-incompatible-functions\
; RUN: -pass-remarks=amdgpu-remove-incompatible-functions %s -o - 2>%t | FileCheck -check-prefixes=COMPATIBLE,REALTIME,MEMTIME %s
; RUN: FileCheck -allow-empty --check-prefixes=WARN-REALTIME,WARN-MEMTIME %s < %t
; RUN: llc -march=amdgcn -mcpu=gfx1030 -verify-machineinstrs < %s

; RUN: llc -march=amdgcn -mcpu=gfx1102 -stop-after=amdgpu-remove-incompatible-functions\
; RUN: -pass-remarks=amdgpu-remove-incompatible-functions %s -o - 2>%t | FileCheck -check-prefixes=INCOMPATIBLE,NOREALTIME,NOMEMTIME %s
; RUN: FileCheck --check-prefixes=WARN-NOREALTIME,WARN-NOMEMTIME %s < %t
; RUN: llc -march=amdgcn -mcpu=gfx1102 -verify-machineinstrs < %s

; Note: This test checks the IR, but also has a run line to codegen the file just to check we
; do not crash when trying to select those functions.

; WARN-REALTIME-NOT: removing function 'needs_s_memrealtime':
; WARN-MEMTIME-NOT: removing function 'needs_s_memtime':
; WARN-NOREALTIME: removing function 'needs_s_memrealtime': +s-memrealtime is not supported on the current target
; WARN-NOMEMTIME: removing function 'needs_s_memtime': +s-memtime-inst is not supported on the current target

; COMPATIBLE: @GVRefs {{.*}} [ptr @needs_s_memrealtime, ptr @needs_s_memtime]
; INCOMPATIBLE: @GVRefs {{.*}} zeroinitializer
@GVRefs = internal global [2 x ptr] [
ptr @needs_s_memrealtime,
ptr @needs_s_memtime
]

; REALTIME: @ConstantExpr0 = internal global i64 ptrtoint (ptr @needs_s_memrealtime to i64)
; NOREALTIME: @ConstantExpr0 = internal global i64 0
@ConstantExpr0 = internal global i64 ptrtoint (ptr @needs_s_memrealtime to i64)

; MEMTIME: @ConstantExpr1 = internal global i64 ptrtoint (ptr @needs_s_memtime to i64)
; NOMEMTIME: @ConstantExpr1 = internal global i64 0
@ConstantExpr1 = internal global i64 ptrtoint (ptr @needs_s_memtime to i64)

; REALTIME: define i64 @needs_s_memrealtime
; NOREALTIME-NOT: define i64 @needs_s_memrealtime
define i64 @needs_s_memrealtime() #0 {
%t = tail call i64 @llvm.amdgcn.s.memrealtime()
ret i64 %t
}

; IR: define void @s_memrealtime_caller(
define i64 @s_memrealtime_caller() {
; REALTIME: call i64 @needs_s_memrealtime(
; NOREALTIME: call i64 null
%t = call i64 @needs_s_memrealtime()
; IR: ret i64 %t
ret i64 %t
}

; MEMTIME: define i64 @needs_s_memtime
; NOMEMTIME-NOT: define i64 @needs_s_memtime
define i64 @needs_s_memtime() #1 {
%t = tail call i64 @llvm.amdgcn.s.memtime()
ret i64 %t
}

; IR: define void @s_memtime_caller(
define i64 @s_memtime_caller() {
; MEMTIME: call i64 @needs_s_memtime(
; NOMEMTIME: call i64 null
%t = call i64 @needs_s_memtime()
; IR: ret i64 %t
ret i64 %t
}


declare i64 @llvm.amdgcn.s.memrealtime()
declare i64 @llvm.amdgcn.s.memtime()

attributes #0 = { "target-features"="+s-memrealtime"}
attributes #1 = { "target-features"="+s-memtime-inst"}

0 comments on commit d1e13c5

Please sign in to comment.