This is an archive of the discontinued LLVM Phabricator instance.

[X86] Update tests for znver3
ClosedPublic

Authored by GGanesh on Dec 7 2020, 8:49 PM.

Download Raw Diff

Details

Reviewers

RKSimon
craig.topper
lebedev.ri
courbet
andreadb

Commits

rGdbfc1ac4d86c: [X86] Update tests for znver3

Summary

I will be submitting a series of patches for AMD family 19H architecture.
This patch adds few znver3 tests to clang that are missing.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

GGanesh created this revision.Dec 7 2020, 8:49 PM

Herald added a reviewer: andreadb. · View Herald TranscriptDec 7 2020, 8:49 PM

Herald added subscribers: mstojanovic, pengfei, jfb and 2 others. · View Herald Transcript

GGanesh requested review of this revision.Dec 7 2020, 8:49 PM

Herald added a project: Restricted Project. · View Herald TranscriptDec 7 2020, 8:49 PM

Herald added subscribers: llvm-commits, Restricted Project, cfe-commits. · View Herald Transcript

Please upload the patch with full context

craig.topper added a subscriber: bkramer.Dec 7 2020, 8:56 PM

craig.topper added inline comments.

clang/lib/Basic/Targets/X86.cpp
548 ↗	(On Diff #310083)	Why is this being deleted?
1339 ↗	(On Diff #310083)	Same here?
compiler-rt/lib/builtins/cpu_model.c
480 ↗	(On Diff #310083)	I thought this code was already added to compiler-rt by @bkramer
llvm/test/CodeGen/X86/cpus-amd.ll
30 ↗	(On Diff #310083)	Why deleted?

Harbormaster completed remote builds in B81392: Diff 310083.Dec 7 2020, 9:35 PM

This patch doesn't look like it is taking into account the existing (albeit limited) support for znver3 - it looks like a very bad merge imo.

It'd make much more sense to split this into several smaller incremental patches:

1 - cleanup any missing basic znver3 handling, building on the work that @bkramer has already done
2 - patches for the new INVLPGB/TLBSYNC/SNP instructions
3 - new znver3 scheduler model

In D92812#2439324, @RKSimon wrote:

it looks like a very bad merge imo.

Yep, Thank you! I will post smaller incremental patches.

Updaing the patch so that the simplified patch adds only few missing znver3 tests. The subsequent patches will comprehensively enable other znver3 features.

tschuett added a subscriber: tschuett.Jan 5 2021, 1:21 PM

Harbormaster completed remote builds in B84106: Diff 314703.Jan 5 2021, 2:01 PM

LGTM

This revision is now accepted and ready to land.Jan 5 2021, 10:54 PM

LGTM - cheers

Patch title should be adjusted I think

GGanesh retitled this revision from [X86] AMD Znver3 (Family 19H) Enablement to [X86] Update tests for znver3.Jan 6 2021, 2:29 AM

Closed by commit rGdbfc1ac4d86c: [X86] Update tests for znver3 (authored by GGanesh). · Explain WhyJan 6 2021, 10:24 PM

This revision was automatically updated to reflect the committed changes.

GGanesh added a commit: rGdbfc1ac4d86c: [X86] Update tests for znver3.

Revision Contents

Path

Size

clang/

test/

Driver/

x86-march.c

4 lines

Frontend/

x86-target-cpu.c

1 line

llvm/

test/

MC/

X86/

x86_long_nop.s

2 lines

Diff 315048

clang/test/Driver/x86-march.c

	Show First 20 Lines • Show All 173 Lines • ▼ Show 20 Lines
	//			//
	// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=znver1 2>&1 \			// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=znver1 2>&1 \
	// RUN: \| FileCheck %s -check-prefix=znver1			// RUN: \| FileCheck %s -check-prefix=znver1
	// znver1: "-target-cpu" "znver1"			// znver1: "-target-cpu" "znver1"
	//			//
	// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=znver2 2>&1 \			// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=znver2 2>&1 \
	// RUN: \| FileCheck %s -check-prefix=znver2			// RUN: \| FileCheck %s -check-prefix=znver2
	// znver2: "-target-cpu" "znver2"			// znver2: "-target-cpu" "znver2"
				//
				// RUN: %clang -target x86_64-unknown-unknown -c -### %s -march=znver3 2>&1 \
				// RUN: \| FileCheck %s -check-prefix=znver3
				// znver3: "-target-cpu" "znver3"

	// RUN: %clang -target x86_64 -c -### %s -march=x86-64 2>&1 \| FileCheck %s --check-prefix=x86-64			// RUN: %clang -target x86_64 -c -### %s -march=x86-64 2>&1 \| FileCheck %s --check-prefix=x86-64
	// x86-64: "-target-cpu" "x86-64"			// x86-64: "-target-cpu" "x86-64"
	// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v2 2>&1 \| FileCheck %s --check-prefix=x86-64-v2			// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v2 2>&1 \| FileCheck %s --check-prefix=x86-64-v2
	// x86-64-v2: "-target-cpu" "x86-64-v2"			// x86-64-v2: "-target-cpu" "x86-64-v2"
	// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v3 2>&1 \| FileCheck %s --check-prefix=x86-64-v3			// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v3 2>&1 \| FileCheck %s --check-prefix=x86-64-v3
	// x86-64-v3: "-target-cpu" "x86-64-v3"			// x86-64-v3: "-target-cpu" "x86-64-v3"
	// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v4 2>&1 \| FileCheck %s --check-prefix=x86-64-v4			// RUN: %clang -target x86_64 -c -### %s -march=x86-64-v4 2>&1 \| FileCheck %s --check-prefix=x86-64-v4
	// x86-64-v4: "-target-cpu" "x86-64-v4"			// x86-64-v4: "-target-cpu" "x86-64-v4"

clang/test/Frontend/x86-target-cpu.c

	Show All 30 Lines
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver1 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver1 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver2 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver2 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver3 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver3 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver4 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu bdver4 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu btver1 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu btver1 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu btver2 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu btver2 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver1 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver1 -verify %s
	// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver2 -verify %s			// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver2 -verify %s
				// RUN: %clang_cc1 -triple x86_64-unknown-unknown -target-cpu znver3 -verify %s
	//			//
	// expected-no-diagnostics			// expected-no-diagnostics

llvm/test/MC/X86/x86_long_nop.s

	Show All 9 Lines
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=btver1 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=btver1 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=btver1 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=btver1 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=btver2 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=btver2 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=btver2 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=btver2 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=znver1 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=znver1 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=znver1 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=znver1 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=znver2 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=znver2 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=znver2 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=znver2 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
				# RUN: llvm-mc -filetype=obj -arch=x86 -triple=x86_64-pc-linux-gnu -mcpu=znver3 %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
				# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu %s -mcpu=znver3 \| llvm-objdump -d --no-show-raw-insn - \| FileCheck %s --check-prefix=LNOP15
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=nehalem %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP10 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=nehalem %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP10 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=westmere %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP10 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=westmere %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP10 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=sandybridge %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=sandybridge %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=ivybridge %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=ivybridge %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=haswell %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=haswell %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=broadwell %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=broadwell %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=skylake %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=skylake %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s
	# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=skx %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s			# RUN: llvm-mc -filetype=obj -arch=x86 -triple=i686-pc-linux-gnu -mcpu=skx %s \| llvm-objdump -d --no-show-raw-insn - \| FileCheck --check-prefix=LNOP15 %s
	▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines