diff --git a/build/ci.profile.yml b/build/ci.profile.yml index da277477e..6442c0527 100644 --- a/build/ci.profile.yml +++ b/build/ci.profile.yml @@ -175,27 +175,6 @@ profiles: - warmup - secondary - amd-lin-app: - variables: - serverAddress: 10.0.0.106 - cores: 48 - agents: - application: - endpoints: - - http://asp-citrine-amd:5001 - aliases: - - main - - amd-lin-load: - variables: - secondaryAddress: 10.0.0.106 - agents: - load: - endpoints: - - http://asp-citrine-amd:5001 - aliases: - - warmup - - secondary amd-lin2-app: variables: diff --git a/build/prbenchmarks.aspnetcore.config.yml b/build/prbenchmarks.aspnetcore.config.yml index 816e9d9c3..e83abc059 100644 --- a/build/prbenchmarks.aspnetcore.config.yml +++ b/build/prbenchmarks.aspnetcore.config.yml @@ -45,9 +45,6 @@ profiles: description: Ampere/Linux 80 Cores arguments: --profile aspnet-citrine-arm-lin-relay - aspnet-citrine-amd: - description: AMD/Linux 48 Cores - arguments: --profile aspnet-citrine-amd-relay benchmarks: plaintext: diff --git a/build/prbenchmarks.runtime.linux_x64.config.yml b/build/prbenchmarks.runtime.linux_x64.config.yml index 7a8461180..787866c4a 100644 --- a/build/prbenchmarks.runtime.linux_x64.config.yml +++ b/build/prbenchmarks.runtime.linux_x64.config.yml @@ -33,9 +33,6 @@ profiles: description: Intel/Linux 12 Cores arguments: --profile aspnet-perf-lin-relay - aspnet-citrine-amd: - description: Amd/Linux 48 Cores - arguments: --profile aspnet-citrine-amd-relay benchmarks: micro: diff --git a/scenarios/README.md b/scenarios/README.md index 525c72473..14a481d4e 100644 --- a/scenarios/README.md +++ b/scenarios/README.md @@ -34,12 +34,10 @@ Each profile defines a set of machines, private IPs and ports that are used to r | `aspnet-perf-win` | INTEL, 12 logical cores, 1 socket, 32GB | Windows Server 2022 | Intel(R) Xeon(R) E-2336 CPU @ 2.90GHz | | `aspnet-citrine-lin` | INTEL, logical 28 cores, 1 socket, 32GB | Ubuntu 20.04, Kernel 5.4.0 | Intel(R) Xeon(R) Gold 5120 CPU @ 2.20GHz | | `aspnet-citrine-win` | INTEL, logical 28 cores, 1 socket, 32GB | Windows Server 2022 | Intel(R) Xeon(R) Gold 5120 CPU @ 2.20GHz | -| `aspnet-citrine-amd` | AMD, logical 48 cores, 1 socket, 64GB, 1 NUMA | Ubuntu 20.04, Kernel 5.4.0 | AMD EPYC 7402P 24-Core Processor | | `aspnet-citrine-amd2` | AMD, logical 48 cores, 1 socket, 64GB, 4 NUMA | Ubuntu 20.04, Kernel 5.4.0 | AMD EPYC 7402P 24-Core Processor | | `aspnet-citrine-arm-lin` | ARM64, 80 logical cores, 1 socket, 1 NUMA, 128 GB | Ubuntu 20.04, Kernel 5.4.0 | Neoverse-N1 | | `aspnet-gold-lin` | INTEL, 56 logical cores, 1 socket, 1 NUMA, 64 GB | Ubuntu 22.04, Kernel 6.8.0-45-generic | Intel(R) Xeon(R) Gold 6330 CPU @ 2.00GHz | | `aspnet-gold-win` | INTEL, 56 logical cores, 1 socket, 1 NUMA, 64 GB | Windows Server 2022 | Intel(R) Xeon(R) Gold 6330 CPU @ 2.00GHz | -| `aspnet-siryn-arm-lin` | ARM64, 128 logical cores, 1 socket, 1 NUMA, 250GB | Ubuntu 20.04, Kernel 5.4.0 | Ampere(R) AmpereOne(TM) | For testing purpose only, the __local__ profile requires a local agent to run: diff --git a/scenarios/aspnet.profiles.standard.yml b/scenarios/aspnet.profiles.standard.yml index 0fb6d5b4e..12244e9ba 100644 --- a/scenarios/aspnet.profiles.standard.yml +++ b/scenarios/aspnet.profiles.standard.yml @@ -164,10 +164,10 @@ profiles: variables: mainAddress: 10.0.0.108 secondaryAddress: 10.0.0.109 - extraAddress: 10.0.0.106 + extraAddress: 10.0.0.103 serverAddress: 10.0.0.108 - databaseServer: 10.0.0.106 - downstreamAddress: 10.0.0.106 + databaseServer: 10.0.0.103 + downstreamAddress: 10.0.0.103 cores: 80 agents: main: @@ -183,7 +183,7 @@ profiles: - warmup extra: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-db:5001 aliases: - db - downstream @@ -192,10 +192,10 @@ profiles: variables: mainAddress: 10.0.0.108 secondaryAddress: 10.0.0.109 - extraAddress: 10.0.0.106 + extraAddress: 10.0.0.103 serverAddress: 10.0.0.108 - databaseServer: 10.0.0.106 - downstreamAddress: 10.0.0.106 + databaseServer: 10.0.0.103 + downstreamAddress: 10.0.0.103 cores: 80 agents: main: @@ -211,7 +211,7 @@ profiles: - warmup extra: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrinedb aliases: - db - downstream @@ -219,11 +219,11 @@ profiles: aspnet-citrine-arm-win: variables: mainAddress: 10.0.0.110 - secondaryAddress: 10.0.0.106 - extraAddress: 10.0.0.109 + secondaryAddress: 10.0.0.105 + extraAddress: 10.0.0.103 serverAddress: 10.0.0.110 - databaseServer: 10.0.0.109 - downstreamAddress: 10.0.0.109 + databaseServer: 10.0.0.103 + downstreamAddress: 10.0.0.103 cores: 80 agents: main: @@ -233,13 +233,13 @@ profiles: - application secondary: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-load:5001 aliases: - load - warmup extra: endpoints: - - http://asp-citrine-amd2:5001 + - http://asp-citrine-db:5001 aliases: - db - downstream @@ -247,11 +247,11 @@ profiles: aspnet-citrine-arm-win-relay: variables: mainAddress: 10.0.0.110 - secondaryAddress: 10.0.0.106 - extraAddress: 10.0.0.109 + secondaryAddress: 10.0.0.105 + extraAddress: 10.0.0.103 serverAddress: 10.0.0.110 - databaseServer: 10.0.0.109 - downstreamAddress: 10.0.0.109 + databaseServer: 10.0.0.103 + downstreamAddress: 10.0.0.103 cores: 80 agents: main: @@ -261,13 +261,13 @@ profiles: - application secondary: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrineload aliases: - load - warmup extra: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd2 + - https://aspnetperf.servicebus.windows.net/citrinedb aliases: - db - downstream @@ -300,47 +300,19 @@ profiles: - db - downstream - aspnet-citrine-amd: - variables: - mainAddress: 10.0.0.106 - secondaryAddress: 10.0.0.103 - extraAddress: 10.0.0.105 - serverAddress: 10.0.0.106 - databaseServer: 10.0.0.105 - downstreamAddress: 10.0.0.105 - cores: 48 - agents: - main: - endpoints: - - http://asp-citrine-amd:5001 - aliases: - - application - secondary: - endpoints: - - http://asp-citrine-db:5001 - aliases: - - load - - warmup - extra: - endpoints: - - http://asp-citrine-load:5001 - aliases: - - db - - downstream - aspnet-citrine-amd-relay: variables: - mainAddress: 10.0.0.106 + mainAddress: 10.0.0.109 secondaryAddress: 10.0.0.103 extraAddress: 10.0.0.105 - serverAddress: 10.0.0.106 + serverAddress: 10.0.0.109 databaseServer: 10.0.0.105 downstreamAddress: 10.0.0.105 cores: 48 agents: main: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrineamd2 aliases: - application secondary: @@ -584,10 +556,10 @@ profiles: variables: mainAddress: 10.0.0.111 secondaryAddress: 10.0.0.109 - extraAddress: 10.0.0.106 + extraAddress: 10.0.0.103 serverAddress: 10.0.0.111 - databaseServer: 10.0.0.106 - downstreamAddress: 10.0.0.106 + databaseServer: 10.0.0.103 + downstreamAddress: 10.0.0.103 cores: 128 agents: main: @@ -603,7 +575,7 @@ profiles: - warmup extra: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-db:5001 aliases: - db - downstream @@ -612,10 +584,10 @@ profiles: variables: mainAddress: 10.0.0.111 secondaryAddress: 10.0.0.109 - extraAddress: 10.0.0.106 + extraAddress: 10.0.0.103 serverAddress: 10.0.0.111 - databaseServer: 10.0.0.106 - downstreamAddress: 10.0.0.106 + databaseServer: 10.0.0.103 + downstreamAddress: 10.0.0.103 cores: 128 agents: main: @@ -631,7 +603,7 @@ profiles: - warmup extra: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrinedb aliases: - db - downstream diff --git a/scenarios/aspnet.profiles.yml b/scenarios/aspnet.profiles.yml index df28bdade..101f35708 100644 --- a/scenarios/aspnet.profiles.yml +++ b/scenarios/aspnet.profiles.yml @@ -204,7 +204,7 @@ profiles: jobs: db: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-db:5001 aliases: - downstream - extra @@ -212,7 +212,7 @@ profiles: endpoints: - http://asp-citrine-ampere:5001 variables: - databaseServer: 10.0.0.106 + databaseServer: 10.0.0.103 aliases: - main load: @@ -229,7 +229,7 @@ profiles: jobs: db: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrinedb aliases: - downstream - extra @@ -237,7 +237,7 @@ profiles: endpoints: - https://aspnetperf.servicebus.windows.net/citrinearmlin variables: - databaseServer: 10.0.0.106 + databaseServer: 10.0.0.103 aliases: - main load: @@ -267,7 +267,7 @@ profiles: - main load: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-load:5001 aliases: - warmup - secondary @@ -292,7 +292,7 @@ profiles: - main load: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrineload aliases: - warmup - secondary @@ -322,34 +322,9 @@ profiles: - warmup - secondary - aspnet-citrine-amd: - variables: - serverAddress: 10.0.0.106 - cores: 48 - jobs: - db: - endpoints: - - http://asp-citrine-load:5001 - aliases: - - downstream - - extra - application: - endpoints: - - http://asp-citrine-amd:5001 - variables: - databaseServer: 10.0.0.105 - aliases: - - main - load: - endpoints: - - http://asp-citrine-db:5001 - aliases: - - warmup - - secondary - aspnet-citrine-amd-relay: variables: - serverAddress: 10.0.0.106 + serverAddress: 10.0.0.109 cores: 48 jobs: db: @@ -360,7 +335,7 @@ profiles: - extra application: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrineamd2 variables: databaseServer: 10.0.0.105 aliases: @@ -579,7 +554,7 @@ profiles: jobs: db: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-db:5001 aliases: - downstream - extra @@ -587,7 +562,7 @@ profiles: endpoints: - http://asp-siryn-lin:5001 variables: - databaseServer: 10.0.0.106 + databaseServer: 10.0.0.103 aliases: - main load: @@ -604,7 +579,7 @@ profiles: jobs: db: endpoints: - - https://aspnetperf.servicebus.windows.net/citrineamd + - https://aspnetperf.servicebus.windows.net/citrinedb aliases: - downstream - extra @@ -612,7 +587,7 @@ profiles: endpoints: - https://aspnetperf.servicebus.windows.net/sirynlin variables: - databaseServer: 10.0.0.106 + databaseServer: 10.0.0.103 aliases: - main load: diff --git a/src/Benchmarks/json.benchmarks.yml b/src/Benchmarks/json.benchmarks.yml index 62745e128..9a68c3e20 100644 --- a/src/Benchmarks/json.benchmarks.yml +++ b/src/Benchmarks/json.benchmarks.yml @@ -134,7 +134,7 @@ profiles: aspnet-citrine-amd: variables: serverPort: 5000 - serverAddress: 10.0.0.106 + serverAddress: 10.0.0.109 cores: 48 jobs: db: @@ -142,7 +142,7 @@ profiles: - http://asp-citrine-db:5001 application: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-amd2:5001 variables: databaseServer: 10.0.0.103 load: diff --git a/src/BenchmarksApps/BuildPerformance/buildperformance.yml b/src/BenchmarksApps/BuildPerformance/buildperformance.yml index 6eefbc0b4..753bd893f 100644 --- a/src/BenchmarksApps/BuildPerformance/buildperformance.yml +++ b/src/BenchmarksApps/BuildPerformance/buildperformance.yml @@ -97,7 +97,7 @@ profiles: aspnet-citrine-amd: variables: serverPort: 5000 - serverAddress: 10.0.0.106 + serverAddress: 10.0.0.109 cores: 48 jobs: db: @@ -105,7 +105,7 @@ profiles: - http://asp-citrine-db:5001 application: endpoints: - - http://asp-citrine-amd:5001 + - http://asp-citrine-amd2:5001 variables: databaseServer: 10.0.0.103 load: