diff options
| -rw-r--r-- | pygments/lexers/amdgpu.py | 5 | ||||
| -rw-r--r-- | tests/examplefiles/amdgpu/amdgpu.isa | 5 | ||||
| -rw-r--r-- | tests/examplefiles/amdgpu/amdgpu.isa.output | 36 |
3 files changed, 43 insertions, 3 deletions
diff --git a/pygments/lexers/amdgpu.py b/pygments/lexers/amdgpu.py index 5356b225..9e4ea0fa 100644 --- a/pygments/lexers/amdgpu.py +++ b/pygments/lexers/amdgpu.py @@ -35,11 +35,12 @@ class AMDGPULexer(RegexLexer): (r'(([a-z_0-9])*:([a-z_0-9])*)', Name.Attribute), (r'(\[|\]|\(|\)|,|\:|\&)', Text), (r'([;#]|//).*?\n', Comment.Single), - (r'((s_)?(ds|buffer|flat|image)_[a-z0-9_]+)', Keyword.Reserved), + (r'((s_)?(scratch|ds|buffer|flat|image)_[a-z0-9_]+)', Keyword.Reserved), (r'(_lo|_hi)', Name.Variable), (r'(vmcnt|lgkmcnt|expcnt)', Name.Attribute), + (r'(attr[0-9].[a-z])', Name.Attribute), (words(( - 'op', 'vaddr', 'vdata', 'soffset', 'srsrc', 'format', + 'op', 'vaddr', 'vdata', 'off', 'soffset', 'srsrc', 'format', 'offset', 'offen', 'idxen', 'glc', 'dlc', 'slc', 'tfe', 'lds', 'lit', 'unorm'), suffix=r'\b'), Name.Attribute), (r'(label_[a-z0-9]+)', Keyword), diff --git a/tests/examplefiles/amdgpu/amdgpu.isa b/tests/examplefiles/amdgpu/amdgpu.isa index 672fdcc1..9d28e47c 100644 --- a/tests/examplefiles/amdgpu/amdgpu.isa +++ b/tests/examplefiles/amdgpu/amdgpu.isa @@ -1,5 +1,8 @@ s_load_dwordx2 s[4:5], s[0:1], 0x10 s_load_dwordx4 s[0:3], s[0:1], 0x00 +scratch_load_dwordx3 v[2:5], v0, off +v_interp_p1_f32_e32 v2, v0, attr0.x +v_interp_p1_f32_e32 v3, v0, attr0.y v_lshlrev_b32 v0, 2, v0 s_waitcnt lgkmcnt(0) v_add_u32 v1, vcc, s2, v0 @@ -8,4 +11,4 @@ v_addc_u32 v2, vcc, v2, 0, vcc v_add_u32 v3, vcc, s0, v0 v_mov_b32 v4, s1 v_addc_u32 v4, vcc, v4, 0, vcc -buffer_load_dword v4, v2, s[8:11], 0 offen
\ No newline at end of file +buffer_load_dword v4, v2, s[8:11], 0 offen diff --git a/tests/examplefiles/amdgpu/amdgpu.isa.output b/tests/examplefiles/amdgpu/amdgpu.isa.output index 6b9e0528..b752ba5c 100644 --- a/tests/examplefiles/amdgpu/amdgpu.isa.output +++ b/tests/examplefiles/amdgpu/amdgpu.isa.output @@ -32,6 +32,42 @@ '0x00' Literal.Number.Integer '\n' Text.Whitespace +'scratch_load_dwordx3' Keyword.Reserved +' ' Text.Whitespace +'v' Name.Variable +'[' Text +'2:5' Name.Attribute +']' Text +',' Text +' ' Text.Whitespace +'v0' Name.Variable +',' Text +' ' Text.Whitespace +'off' Name.Attribute +'\n' Text.Whitespace + +'v_interp_p1_f32_e32' Keyword +' ' Text.Whitespace +'v2' Name.Variable +',' Text +' ' Text.Whitespace +'v0' Name.Variable +',' Text +' ' Text.Whitespace +'attr0.x' Name.Attribute +'\n' Text.Whitespace + +'v_interp_p1_f32_e32' Keyword +' ' Text.Whitespace +'v3' Name.Variable +',' Text +' ' Text.Whitespace +'v0' Name.Variable +',' Text +' ' Text.Whitespace +'attr0.y' Name.Attribute +'\n' Text.Whitespace + 'v_lshlrev_b32' Keyword ' ' Text.Whitespace 'v0' Name.Variable |