3 files changed, 17 insertions, 5 deletions
diff --git a/tcwg-base/tcwg-dev/start.sh b/tcwg-base/tcwg-dev/start.sh
index b281d34b..c22f008f 100755
--- a/tcwg-base/tcwg-dev/start.sh
+++ b/tcwg-base/tcwg-dev/start.sh
@@ -100,7 +100,9 @@ case "$home" in
 esac
 
 # Use at most half of all available RAM.
-memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G
+memlimit=$(free -m | awk '/^Mem/ { print $2 }')
+memlimit=$(($memlimit / 2))m
+
 # IPC_LOCK is required for some implementations of ssh-agent (e.g., MATE's).
 # SYS_PTRACE is required for debugger work.
 # seccomp=unconfined to allow disabling of ASLR for sanitizer regression tests.
diff --git a/tcwg-base/tcwg-host/start.sh b/tcwg-base/tcwg-host/start.sh
index a9a5519c..9a865db7 100755
--- a/tcwg-base/tcwg-host/start.sh
+++ b/tcwg-base/tcwg-host/start.sh
@@ -76,6 +76,7 @@ mounts="$mounts -v /var/run/docker.sock:/var/run/docker.sock"
 mounts="$mounts -v /usr/bin/docker:/usr/bin/docker"
 
 # Use at most half of all available RAM.
-memlimit=$(($(free -g | awk '/^Mem/ { print $2 }') / 2))G
+memlimit=$(free -m | awk '/^Mem/ { print $2 }')
+memlimit=$(($memlimit / 2))m
 
 $DOCKER run -dt --name=$task --network host --restart=unless-stopped $mounts --memory=$memlimit --pids-limit=5000 $image "$group" "$task"
diff --git a/tcwg-base/tcwg-llvmbot/start.sh b/tcwg-base/tcwg-llvmbot/start.sh
index 38ee277b..264ac899 100755
--- a/tcwg-base/tcwg-llvmbot/start.sh
+++ b/tcwg-base/tcwg-llvmbot/start.sh
@@ -47,8 +47,17 @@ case "$mastername" in
     *) cpu_shares=1000 ;;
 esac
 
-# Use 64G out of 128G.
-memlimit="64"
+memlimit=$(free -m | awk '/^Mem/ { print $2 }')
+case "$slavename" in
+    linaro-tk1-*)
+	# Use at most 90% of RAM on TK1s
+	memlimit=$(($memlimit * 9 / 10))m
+	;;
+    *)
+	# Use at most half of all available RAM.
+	memlimit=$(($memlimit / 2))m
+	;;
+esac
 
 case "$slavename" in
     *-lld) pids_limit="15000" ;;
@@ -60,4 +69,4 @@ esac
 # seccomp:unconfined is required to disable ASLR for sanitizer tests.
 caps="--cap-add=IPC_LOCK --cap-add=SYS_PTRACE --security-opt seccomp:unconfined"
 
-$DOCKER run --name=$mastername-$slavename --hostname=$mastername-$slavename --restart=unless-stopped -dt -p 22 --cpu-shares=$cpu_shares --memory=${memlimit}G --pids-limit=$pids_limit $caps "$image" "$masterurl" "$slavename" "$password"
+$DOCKER run --name=$mastername-$slavename --hostname=$mastername-$slavename --restart=unless-stopped -dt -p 22 --cpu-shares=$cpu_shares --memory=$memlimit --pids-limit=$pids_limit $caps "$image" "$masterurl" "$slavename" "$password"