Skip to content

Improve CPU load calculation#105

Merged
LeandroMartinsdS merged 14 commits into
dls-masterfrom
CPU_CoreManagement
May 14, 2024
Merged

Improve CPU load calculation#105
LeandroMartinsdS merged 14 commits into
dls-masterfrom
CPU_CoreManagement

Conversation

@LeandroMartinsdS
Copy link
Copy Markdown
Contributor

@LeandroMartinsdS LeandroMartinsdS commented Sep 29, 2023

Improve CPU load calculation for Power PMAC, being possible to read the usage for up to 4 cores.
For ARM architecture, supports custom core management reading the core that executes each task (phase, servo, RT and background).

@LeandroMartinsdS LeandroMartinsdS self-assigned this Sep 29, 2023
JamesOHeaDLS
JamesOHeaDLS reviewed Oct 2, 2023
View reviewed changes
Copy link
Copy Markdown

@JamesOHeaDLS JamesOHeaDLS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @LeandroMartinsdS

Overall it looks good. I have added some inline review comments to the code.

Have you tested how the system behaves if no CPU is recognised?

Thanks,

James

Comment thread pmacApp/src/pmacController.cpp
Comment thread pmacApp/src/pmacController.cpp Outdated
Comment thread pmacApp/src/pmacController.cpp Outdated
Comment thread pmacApp/src/pmacController.cpp
Comment thread pmacApp/src/pmacController.cpp Outdated
Comment thread pmacApp/src/pmacController.cpp Outdated
Comment thread pmacApp/src/pmacController.h Outdated
Comment thread pmacApp/src/pmacController.h Outdated
Comment thread pmacApp/src/pmacController.h Outdated
Comment thread pmacApp/src/pmacController.cpp
@LeandroMartinsdS
Copy link
Copy Markdown
Contributor Author

LeandroMartinsdS commented Oct 6, 2023

I made this test
Have you tested how the system behaves if no CPU is recognised?

Now, the usage percentage of each task is summed into the first core usage.
I can easily change that to set all of the cores to 0% - I'm not sure if that would be clear enough to indicate an error.

@LeandroMartinsdS
Copy link
Copy Markdown
Contributor Author

LeandroMartinsdS commented Nov 10, 2023

@JamesOHeaDLS, I think that all of your suggestions are sorted.

As I have made a few changes, would be nice to have a look again just in case I've missed something.

Thanks.

JamesOHeaDLS
JamesOHeaDLS reviewed Nov 10, 2023
View reviewed changes
Copy link
Copy Markdown

@JamesOHeaDLS JamesOHeaDLS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall. I have made a couple of comments/suggestions

Comment thread pmacApp/src/pmacController.cpp Outdated
Comment thread pmacApp/src/pmacController.cpp Outdated
Comment thread pmacApp/Db/pmacController.template Outdated
Comment thread pmacApp/src/pmacController.cpp
@LeandroMartinsdS LeandroMartinsdS force-pushed the CPU_CoreManagement branch 2 times, most recently from 3c2294c to 5494862 Compare February 1, 2024 16:57
@LeandroMartinsdS
Copy link
Copy Markdown
Contributor Author

LeandroMartinsdS commented Apr 26, 2024 •
edited
Loading

A personal reminder to change the debug level of each task frequency/time/percentage from DEBUG_TRACE to DEBUG_VARIABLE

@LeandroMartinsdS
Remove BgSleepTime from CPU calculation
3fc7ed8 
The PowerPMAC firmware already adjusts BgDeltaTime when BgSleepTime changes

Remove repeated snippet caused by merging with conflicts
@LeandroMartinsdS
Add support for custom tasks allocation in CPU load calculation
d474848 
Gets the number of cores for each type of CPU.

Defines in which core the tasks are executed - for ARM arch it reads
from the controller.
It doesn't take in account Ethercat tasks.

Calculates the CPU load for each core based on the tasks defined -
maximum of 4 cores.
@LeandroMartinsdS
Remove unused variables and create defined macros
8f0ae17
@LeandroMartinsdS
Include severity for CPUNUMCORES record
62c868f
@LeandroMartinsdS
Update pmacController.edl for multi-core CPUs
17b1be4
@LeandroMartinsdS
Fix debug message
b23e327
@LeandroMartinsdS
Revert LF removal from cpu command reply
3e88b5a 
PR #103 sorts that in the correct way
@LeandroMartinsdS
Initilize cpuLoad_ as vector
9ff699c
@LeandroMartinsdS
Update debug message including PPMAC_CPU_MAXCORES
bdc1c9d
@LeandroMartinsdS
Remove alarms from CPUNUMCORES record
b4297fc
@LeandroMartinsdS
Update Cpu type and cores debug messages
1b456bd 
Move debug messages to getCpuNumCores
Changed from debugf to printf as it runs only during the startup.
@LeandroMartinsdS
Include geobrick and clipper in getCpuNumCores
ccbaea3
@LeandroMartinsdS
Tweak pmacController screen
8e51be9
@LeandroMartinsdS
Change CPU usage debug messages to DEBUG_VARIABLE
c3497fd
@LeandroMartinsdS LeandroMartinsdS merged commit 27576bf into dls-master May 14, 2024
@LeandroMartinsdS LeandroMartinsdS deleted the CPU_CoreManagement branch May 14, 2024 13:28
@LeandroMartinsdS
Copy link
Copy Markdown
Contributor Author

LeandroMartinsdS commented May 14, 2024

Tagged as 2-6-4b3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JamesOHeaDLS JamesOHeaDLS JamesOHeaDLS left review comments

@ajgdls ajgdls Awaiting requested review from ajgdls

@LeeHudsonDLS LeeHudsonDLS Awaiting requested review from LeeHudsonDLS

Assignees

@LeandroMartinsdS LeandroMartinsdS

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@LeandroMartinsdS @JamesOHeaDLS